diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
index 1a871d82ec03..ea2dba3fcc63 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
index f0af8132a3a7..ab61bf9f2144 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
diff --git a/app-accessibility/caribou/caribou-0.4.20.ebuild b/app-accessibility/caribou/caribou-0.4.20.ebuild
index 26c3157d1a76..4804eb814073 100644
--- a/app-accessibility/caribou/caribou-0.4.20.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.20.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-accessibility/orca/orca-3.18.2.ebuild b/app-accessibility/orca/orca-3.18.2.ebuild
index 090e21a8f091..7d2b6adcbe24 100644
--- a/app-accessibility/orca/orca-3.18.2.ebuild
+++ b/app-accessibility/orca/orca-3.18.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild b/app-admin/consul/consul-0.5.2-r2.ebuild
similarity index 97%
rename from app-admin/consul/consul-0.5.2-r1.ebuild
rename to app-admin/consul/consul-0.5.2-r2.ebuild
index 57487ede25d6..1e80b04c9abe 100644
--- a/app-admin/consul/consul-0.5.2-r1.ebuild
+++ b/app-admin/consul/consul-0.5.2-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit git-r3 golang-base systemd user
+inherit golang-base systemd user
 
 GO_PN="github.com/hashicorp/consul"
 
@@ -152,8 +152,6 @@ src_install() {
 	newconfd "${FILESDIR}/consul.confd" "${PN}"
 	systemd_dounit "${FILESDIR}/consul.service"
 
-	egit_clean "${WORKDIR}"/{pkg,src}
-
 	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
 
 	while read -r -d '' x; do
@@ -163,8 +161,8 @@ src_install() {
 		rm -rf "${WORKDIR}"/src/${x}
 	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/src/${GO_PN}
 }
diff --git a/app-admin/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3-r1.ebuild
similarity index 98%
rename from app-admin/consul/consul-0.6.3.ebuild
rename to app-admin/consul/consul-0.6.3-r1.ebuild
index 9b35adb4d534..90ec2beb0311 100644
--- a/app-admin/consul/consul-0.6.3.ebuild
+++ b/app-admin/consul/consul-0.6.3-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit git-r3 golang-base systemd user
+inherit golang-base systemd user
 
 GO_PN="github.com/hashicorp/consul"
 
@@ -154,8 +154,6 @@ src_install() {
 	newconfd "${FILESDIR}/consul.confd" "${PN}"
 	systemd_dounit "${FILESDIR}/consul.service"
 
-	egit_clean "${WORKDIR}"/{pkg,src}
-
 	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
 
 	while read -r -d '' x; do
@@ -165,8 +163,8 @@ src_install() {
 		rm -rf "${WORKDIR}"/src/${x}
 	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/src/${GO_PN}
 }
diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild
index f6d1b09295e5..0e865fe8e4c0 100644
--- a/app-admin/consul/consul-9999.ebuild
+++ b/app-admin/consul/consul-9999.ebuild
@@ -118,8 +118,8 @@ src_install() {
 		rm -rf "${WORKDIR}"/src/${x}
 	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/src/${GO_PN}
 }
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 03740536ef82..c9beb74f4519 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,4 +1,4 @@
-DIST logstash-2.1.2.tar.gz 74425223 SHA256 5d396acf901558c49b231a954741b805a57a67a45ce6b22056fa296690b2cdab SHA512 aafec2ea88849f8a844ba4276a4193a374e4f549756117535f625e4b5b384304d411382066bc39f76ebab440a7ae417d31f6d5b43c1c16c9772cac6f02f4a0db WHIRLPOOL d96b89979debc71a10b90f5ee7efedcd2e4e858750886f3fde0991ac22a5f09b869ea2c3a68bbfc1f2bd630ac748c38ade44e4d5950b923619d6e1519a683b96
+DIST logstash-2.1.3.tar.gz 74433726 SHA256 c592ea6c63a64f44a08a4b86b8ce6e72847ffdf0cd207d1571dcfda899f7134f SHA512 76a25c4ac49b2d8d10ea13e60a249dad95b661f54310ad5ba7abf169065429342323e97d0bd1954542db31627d27762aabd0087186e3176a27066afc9b1e185c WHIRLPOOL 7da3f23e3fa0c09c7de0098dc09c5019e7bd5e7b3bf67b6df7b9d5d5ee06e6f2cb88c49b3865931cbe58342b28dd6035ea7da6889ff55d00ab6b87612a7ceff2
 DIST logstash-2.2.0.tar.gz 74440588 SHA256 aee2437f45c726ec354f0bf9634b3638428d48bef32beb412f827eb2cc736f78 SHA512 8a167971731bf0d0a7eddb023c57c66fa8ebeb0842756711795117bdb988018040ea50848c1f6e06ba748d76b723a39f758e275778270cf92acebb3284263ce0 WHIRLPOOL b07eba50168bd9ee9e7b55e8b9fd181353188db4b4c8e4dedc289cd8c8d4fae4c10650a8d968c06cd90e132f90adbc0805c077f1d891ef968e5ae02bf240dc27
-DIST logstash-2.2.1.tar.gz 74453503 SHA256 a7c55428aabdf2a2143f5907f3e5bb4bfba897f17359142e4dae70d7b446591e SHA512 9fff0f46b15a26a2679fe24fe5f2c80d90d92381b195b8c77f0b22cf61865b8834219e1ac09a10f4407b0b6cedcbe79c18ce0e529decf083b05a05ca96660f11 WHIRLPOOL e75f6fccf139eaaeb8fb09538c0ad5e56bd2945838b567a9aa1535275b1d849513835230547102010d06375727bfc3d0e900d408f196b6366947e29448ebc2e2
+DIST logstash-2.2.2.tar.gz 74452781 SHA256 f0a29ec8fd327e42f3023bd6bf85a00ac20617bfc214df59c765453977398312 SHA512 bab0463f6d4aeccfac04007d318b8cf70d56c803dfaa7948fb7dc1ca29bb91ccc3b1c5b705bede585e4adb98e63b3515bbabfc1206378e3b53ead78cf08c3da4 WHIRLPOOL 92122b7687b7230ad9d9415d9bbcca737cabb46f512d2a86f4401205a3cdf0f31bee8bf6e0a42066a54234474b490c008ad2084f8ff5a5fc5af87532842de39a
 DIST logstash-all-plugins-2.2.0.tar.gz 129473672 SHA256 966b5408e66af003f96084bf6f8764855c00530db8b326513d795541a62e4d41 SHA512 0725275e312f9a936d750959ccc388bac0df91ff7dd1a74d501cfdfe20006a0a5008d0877012ad80b5caece3f64bdc86b79ffb20e2f07c4a8cd5bdd2daf8d1b2 WHIRLPOOL 3cfaf4693a0b7ef0343a973de344b063ad0d1928bf9316cc893ed88de9a7ef209a206d0cb881582c2213de9409874a959c44d874af82a5bad6468943fe4297c8
diff --git a/app-admin/logstash-bin/logstash-bin-2.1.2.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild
similarity index 100%
rename from app-admin/logstash-bin/logstash-bin-2.1.2.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.1.3.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-2.2.1.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild
similarity index 100%
rename from app-admin/logstash-bin/logstash-bin-2.2.1.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.2.2.ebuild
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 42138ded617a..00b79a1990b3 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -2,4 +2,4 @@ DIST Rex-1.0.0.tar.gz 261873 SHA256 894ba5128842b33cbc5dfeabdbeded18f303d2efbb08
 DIST Rex-1.2.0.tar.gz 267664 SHA256 26a222bf418950b94b53c22c5fe87828a1503d6794a5516759914c5925f5f6fb SHA512 68467d00b6acdedd6b92dd51a8a6b42e3acf92fd28713a7ee7137744cd071b681e2e8f2fc5cf45df8979bdb78e9b49d2dbd52db7505f8aa9169b18e94e38719d WHIRLPOOL 453330d69b4a8e7e5f689fd10797233948a32fc239025fe68196ee2bfcd71f762f80e008e959cec209da58c8e1bb9be9ac66abaea9efe3bd70b4fcd38f903a8e
 DIST Rex-1.3.2.tar.gz 271446 SHA256 49be858e2ae51dda2fa2769b5e824ca2b5b7605f3b7e6c2f613b889e132e34b0 SHA512 589383b5a2c993e775be12ecd7b6ed5b525bd1f503311592bb302dd8558f5e0221fae6b459d4b52be418cb423fd294a759a63fce918b260e7c90fa153df0525a WHIRLPOOL ace24f03fc5ee5cb5b58bc14d4eb60f18598df645ad4c39260797012e2ecd2c40f72b3875f63dd5b4213990a6de817abcd511ade5d2928110072719e8b9c8ee2
 DIST Rex-1.3.3.tar.gz 274725 SHA256 111e80515fc3c1846668aa4ff0731443a58f3e74d78063dfc61fea96ca49cde6 SHA512 b2331e400027568f59496ff52f0a19bd009f66fea2a5b80ed9055859f59f0057afa50f61934cccd5af434c6f60dfa99700bc3904127b822a5ae684cb8bb6c70c WHIRLPOOL c8285e50f0259060ead8e86b120b3a16d6a1f506dec8eead33ac5e8a0af8371083a73315cf859c99433a7b8c902cbd48f383326c6ce2b0c4d900681baf623a51
-DIST Rex-1.3.3_02.tar.gz 284949 SHA256 816ad482aeb7c614b10066433d2789169b0513963d0a57b09ae1526727ec1499 SHA512 0e1e88627128bcb07e5fb2e8fb1b64e0cb412372cc44f7d1e2f4a6eb48229385f9a83c3b472e7176895eaa7523efe3000f510283ca98cc8f64967a33f9672200 WHIRLPOOL 5923b06c72d4139c1dab4e696f2092faeb05a3ea1fa480bc3dee19719e29dfdc4f1a045a1357ba8d9e6a7dee5987fc9cd27fcc7d71172833fe32cdc7354a83dd
+DIST Rex-1.3.3_03.tar.gz 285174 SHA256 213553011ca7bd351a257d1180701d8bb8bade090280296e1f10f6edb06ea09a SHA512 299c232d050bdbc27f951f7a584b639a3126c0e7f364e2016016c8bbedf828c5a158a76e36c47c5d4c61a7a80b5613cdfb04153ba8fda7edffa95d9ee5d4bcc6 WHIRLPOOL ab8286e34092c0f59a5f047ae8fd0992abf7703c653ae47f29521778305f15498a04e4ca634aa7384f4e83112b6a7e20756118aecaba9511f38a2ff784a6153b
diff --git a/app-admin/rex/rex-1.4.0_rc2.ebuild b/app-admin/rex/rex-1.4.0_rc3.ebuild
similarity index 97%
rename from app-admin/rex/rex-1.4.0_rc2.ebuild
rename to app-admin/rex/rex-1.4.0_rc3.ebuild
index 925841fba6da..0c3de4dab5fc 100644
--- a/app-admin/rex/rex-1.4.0_rc2.ebuild
+++ b/app-admin/rex/rex-1.4.0_rc3.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 MODULE_AUTHOR=FERKI
-MODULE_A=Rex-1.3.3_02.tar.gz
+MODULE_A=Rex-1.3.3_03.tar.gz
 
 inherit perl-module
 
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 72df6cfc6ccd..cbbaea3174f6 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,4 +1 @@
-DIST gox-0.3.0.tar.gz 13735 SHA256 29dc6b689f670a5444cc54cd9111549ccb01501901bc9197d0e1325a35157802 SHA512 cbc737a780403d1233af10a85b30676e0fcfbfbe99a740d0eff69bef4fd557c65d102c43b3b0dde0b8b935967be8cb33fab50d2baf481d27fa53285be6b1aef2 WHIRLPOOL f3a10a965c4cfe0707bad2f8307162564b00d2b0279d61311445714f28a17d97a4ee4d5a442a7aaaf25b9f44eff656a8b84485bdb0e5776cc7a1014350cff216
-DIST iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz 1110 SHA256 27aa65991036fe736d3c383378e49758097f5a11a20b40f44cc434eac97659f7 SHA512 a4314506416d6ab84c9cd96aeadc8d08c88df8f2a146b1e6a51e5f756c2e2409f39adf274487998d0229a46d81b2d0899717064459966f4dbfa5571cc9e85400 WHIRLPOOL 9fd40b227de5452642696326b0b0a66d95e2ddf738a1b6e7e712e201101bb84cc854161609836cae82515ba95ba1e5efd331ce68abdf79c654a9d7a874f849f3
-DIST vault-0.1.2.tar.gz 1158880 SHA256 b8d56f1ebd11f5d80a6a6728b6c9ac399c7e507e3e9fe8830966be50ba15d1b3 SHA512 49488d4fac62521e485a623a3f5fa384643e84bb9aff616efec2169d84731f9892b5ffa1ae475ce905032f6f8e816a372535bc328daf4ee5caf0344a3cd2e9bc WHIRLPOOL f1d678145fad5b8a988dacb8aabf02394a81b267aeabdd2a2968c0efc9576997e980800fe0f08fb70d2f6052fce5d9d94c6d46ee0b50d97ca68b404a78c2c381
 DIST vault-0.4.1.tar.gz 2108269 SHA256 e986424d9bb0ace5450e8ed576d102f1d2d3a9d2d4c2046710aa55464a9fc296 SHA512 5b46e7f28e4b79f48bdc03ee65177a2cc3e10b71a05f34bb78f9c00ee6b4249447c39f3830ce5bfa7a8289fad5fa532420f769c21bfc33168cfed86bacc228f5 WHIRLPOOL 5b5d65931dcb381f659fa423765783a78f812420c4de29102a50da8d7215fb96e34de39f407917a12a7aa21c3bbc01c751df278676aaefdd620edf6910949dbc
diff --git a/app-admin/vault/vault-0.1.2-r1.ebuild b/app-admin/vault/vault-0.1.2-r1.ebuild
deleted file mode 100644
index 558bf59e87e8..000000000000
--- a/app-admin/vault/vault-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fcaps golang-build systemd user
-
-GO_PN="github.com/hashicorp/${PN}"
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="
-	https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz -> gox-0.3.0.tar.gz
-	https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz -> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/go-oauth2:="
-RDEPEND=""
-
-STRIP_MASK="*.a"
-
-S="${WORKDIR}/src/${GO_PN}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ei' usr/bin/${PN}
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_unpack() {
-	local x
-
-	default
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${P} src/${GO_PN} || die
-
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	export GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" || die
-
-	export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
-
-	while read -r -d '' x; do
-		rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
-	done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
-
-	mkdir -p "${GOROOT}/src/github.com/mitchellh" || die
-	rm -rf "${GOROOT}/src/github.com/mitchellh/gox" || die
-	mv gox-0.3.0 "${GOROOT}/src/github.com/mitchellh/gox" || die
-	rm -rf "${GOROOT}/src/github.com/mitchellh/iochan" || die
-	mv iochan-* "${GOROOT}/src/github.com/mitchellh/iochan" || die
-}
-
-src_prepare() {
-	# Avoid the need to have a git checkout
-	sed -e 's:^GIT.*::' \
-		-e 's:-ldflags.*:\\:' \
-		-i scripts/build.sh || die
-}
-
-src_compile() {
-	go install -v -x github.com/mitchellh/gox || die
-	PATH=${GOROOT}/bin:${PATH} emake dev
-}
-
-src_install() {
-	local x
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-
-	egit_clean "${WORKDIR}"/{pkg,src}
-
-	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
-
-	while read -r -d '' x; do
-		x=${x#${WORKDIR}/src}
-		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
-			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
-		rm -rf "${WORKDIR}"/src/${x}
-	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
-	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
-	doins -r "${WORKDIR}"/src/${GO_PN}
-}
diff --git a/app-admin/vault/vault-0.4.1.ebuild b/app-admin/vault/vault-0.4.1.ebuild
index 98fbc4e8b747..7e0d80b73b3e 100644
--- a/app-admin/vault/vault-0.4.1.ebuild
+++ b/app-admin/vault/vault-0.4.1.ebuild
@@ -83,8 +83,8 @@ src_install() {
 		rm -rf "${S}"/src/${x}
 	done < <(find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto $(dirname /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*})
+	insinto $(dirname "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}")
 	doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}
-	insinto $(dirname /usr/lib/go/src/${EGO_PN%/*})
+	insinto $(dirname "$(get_golibdir)/src/${EGO_PN%/*}")
 	doins -r "${S}"/src/${EGO_PN%/*}
 }
diff --git a/app-admin/vault/vault-9999.ebuild b/app-admin/vault/vault-9999.ebuild
index 4c8a514f461e..531205c6e23a 100644
--- a/app-admin/vault/vault-9999.ebuild
+++ b/app-admin/vault/vault-9999.ebuild
@@ -98,8 +98,8 @@ src_install() {
 		rm -rf "${WORKDIR}"/src/${x}
 	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
 	doins -r "${WORKDIR}"/src/${GO_PN}
 }
diff --git a/app-arch/file-roller/file-roller-3.16.4-r1.ebuild b/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
index d58e1fe5d833..ba6dcb4ebf6d 100644
--- a/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
+++ b/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+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
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
new file mode 100644
index 000000000000..bfb5436c157e
--- /dev/null
+++ b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite"
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+S="${WORKDIR}/${P}.1"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.96-compile-flags.patch" #426788
+	"${FILESDIR}"/${P}-zcav-array-indexing-fix.patch #309319
+)
+
+DOCS=( README.txt README-2.00 debian/changelog credits.txt )
+HTML_DOCS=( readme.html )
+
+src_configure() {
+	econf \
+		$(usex debug "--enable-debug" "") \
+		--disable-stripping
+}
+
+src_install() {
+	dobin bonnie++ zcav bon_csv2html bon_csv2txt
+	sed -i -e \
+		"s:/usr/share/doc/bonnie++:${EPREFIX}/usr/share/doc/${PF}/html:g" \
+		bonnie++.8 || die #431684
+	doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+	einstalldocs
+}
diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
new file mode 100644
index 000000000000..3d92689541db
--- /dev/null
+++ b/app-benchmarks/bonnie++/files/bonnie++-1.97-zcav-array-indexing-fix.patch
@@ -0,0 +1,35 @@
+From: Göktürk Yüksek <gokturk@binghamton.edu>
+Subject: [PATCH] Fix array indexing in Zcav::Read when max_loop > 1 and start_offset > 0
+
+In method Zcav::Read, the variable 'i' holds the block index. It is
+also used as an index to arrays of measurement values (read times and
+block counts) when (max_loops > 0). However, the blocks array and
+measurements arrays will be out of sync if some initial blocks are to
+be skipped (by having start_offset > 0). Using the same index value
+for arrays of different sizes causes segfaults. Fix it by substracting
+the start_offset properly when accessing the measurements arrays.
+
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=309319
+
+--- a/zcav_io.cpp
++++ b/zcav_io.cpp
+@@ -108,7 +108,7 @@
+     double total_read_time = 0.0;
+     bool nextLoop = false;
+     for( ; !nextLoop && (!max_size || i < max_size)
+-              && (loops == 0 || (m_times[i] && m_times[i][0] != -1.0))
++              && (loops == 0 || (m_times[i - start_offset] && m_times[i - start_offset][0] != -1.0))
+               && (!max_size || i < max_size); i++)
+     {
+       double read_time = access_data(i ? skip_rate - 1 : 0);
+@@ -135,8 +135,8 @@
+           m_times.push_back(new double[max_loops]);
+           m_count.push_back(0);
+         }
+-        m_times[i][loops] = read_time;
+-        m_count[i]++;
++        m_times[i - start_offset][loops] = read_time;
++        m_count[i - start_offset]++;
+       }
+     } // end loop for reading blocks
+ 
diff --git a/app-cdr/brasero/brasero-3.12.1-r1.ebuild b/app-cdr/brasero/brasero-3.12.1-r1.ebuild
index 5b591a429991..374380c4370a 100644
--- a/app-cdr/brasero/brasero-3.12.1-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
 IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.14:2
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
index 5c7d56381836..0e97839c5d2d 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="gcdmaster encode mad vorbis"
 
 RDEPEND="virtual/cdrtools
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
new file mode 100644
index 000000000000..1677b9878095
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -0,0 +1 @@
+DIST debian-archive-keyring_2014.3.tar.xz 61380 SHA256 46be978ec2f72b0277d9e71bda30ea1b2b9aa00b1952cb35e8b22a2c016f5e22 SHA512 6ae189976dca807705c76fab16d8219f042dc3c8a12e6f12872cc6faa8941831392d0b97a34367c24855f98621ba2eb56e71440291bc12a5cecc05ea2b5622ab WHIRLPOOL 94344189e21e42333e5f131aada6bda02d7f9bf72c809df00ef6e570810524bd9b9f4e79b55237b224155fb651205a60848ce037e4dae138b6449e97c1ace9ea
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
new file mode 100644
index 000000000000..0e10b93efd7a
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2014.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Debian archive"
+HOMEPAGE="http://packages.debian.org/sid/debian-archive-keyring"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/jetring"
+
+MAKEOPTS+=' -j1'
diff --git a/app-crypt/debian-archive-keyring/metadata.xml b/app-crypt/debian-archive-keyring/metadata.xml
new file mode 100644
index 000000000000..75493d77fb70
--- /dev/null
+++ b/app-crypt/debian-archive-keyring/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>sping@gentoo.org</email>
+    <name>Sebastian Pipping</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/gcr/gcr-3.18.0.ebuild b/app-crypt/gcr/gcr-3.18.0.ebuild
index 75d7ee0d486a..c896b7f9913a 100644
--- a/app-crypt/gcr/gcr-3.18.0.ebuild
+++ b/app-crypt/gcr/gcr-3.18.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/gnupg-2
diff --git a/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild b/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
index a5b69e0236f6..924b7be35b8c 100644
--- a/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
+++ b/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/app-crypt/gkeys/gkeys-0.2.ebuild b/app-crypt/gkeys/gkeys-0.2.ebuild
index 0e78a860bab3..e477ffdda907 100644
--- a/app-crypt/gkeys/gkeys-0.2.ebuild
+++ b/app-crypt/gkeys/gkeys-0.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
index 4b653de3dbf2..f902135e60fa 100644
--- a/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tofu tools usb"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-crypt/jetring/Manifest b/app-crypt/jetring/Manifest
new file mode 100644
index 000000000000..8eed1c28e342
--- /dev/null
+++ b/app-crypt/jetring/Manifest
@@ -0,0 +1 @@
+DIST jetring_0.21.tar.gz 192974 SHA256 6a9ef726c1746ab57361dcda14c6ab0fdfd1dcb4ef1ffda9959251449c7a9814 SHA512 bc3bfa0afaa7e6e9a79688447bc9a23271fce951646f7d159ffeb4df749c36536612b6a371034586d63f1dfdbfee24aad68ac44a350bd8f1f4b18fd5dbbe1b7b WHIRLPOOL 255dbeb922a6d9a2b9fb3ba3c2976646cbab6e45c136e9498da87ad448bc19376db2f80e6d378c4fd4881d08f25a01a1a398596aeb823aea62d7be38e9b0430c
diff --git a/app-crypt/jetring/files/jetring-0.21-parallel.patch b/app-crypt/jetring/files/jetring-0.21-parallel.patch
new file mode 100644
index 000000000000..af5605fe0c82
--- /dev/null
+++ b/app-crypt/jetring/files/jetring-0.21-parallel.patch
@@ -0,0 +1,31 @@
+From 4554254608c97aed3f9e654ca219c53e3c4e2ec1 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 21 Feb 2016 18:47:46 +0100
+Subject: [PATCH] Address make warning "jobserver unavailable"
+
+To be precise:
+make[1]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6e62bda..43a14b7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,10 +3,10 @@ PROGS=jetring-accept jetring-apply jetring-build jetring-diff \
+ 	jetring-checksum
+ 
+ build:
+-	make -C example build
++	$(MAKE) -C example build
+ 
+ clean:
+-	make -C example clean
++	$(MAKE) -C example clean
+ 
+ install:
+ 	install -d $(DESTDIR)/usr/bin/
+-- 
+2.7.1
+
diff --git a/app-crypt/jetring/jetring-0.21.ebuild b/app-crypt/jetring/jetring-0.21.ebuild
new file mode 100644
index 000000000000..417345d376fb
--- /dev/null
+++ b/app-crypt/jetring/jetring-0.21.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="GPG keyring maintenance using changesets"
+HOMEPAGE="http://joeyh.name/code/jetring/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.21-parallel.patch
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}/
+	doins -r example
+
+	doman ${PN}*.[0-9]
+}
diff --git a/app-crypt/jetring/metadata.xml b/app-crypt/jetring/metadata.xml
new file mode 100644
index 000000000000..6d2298876faa
--- /dev/null
+++ b/app-crypt/jetring/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>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/libsecret/libsecret-0.18.4.ebuild b/app-crypt/libsecret/libsecret-0.18.4.ebuild
index bed4d00f42bd..a5f757226e0e 100644
--- a/app-crypt/libsecret/libsecret-0.18.4.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.4.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="+crypt +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/app-crypt/sbsigntool/sbsigntool-0.6.ebuild b/app-crypt/sbsigntool/sbsigntool-0.6.ebuild
deleted file mode 100644
index 5810850a8a04..000000000000
--- a/app-crypt/sbsigntool/sbsigntool-0.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	virtual/pkgconfig"
-
-src_prepare() {
-	local iarch
-	case ${ARCH} in
-		ia64)  iarch=ia64 ;;
-		x86)   iarch=ia32 ;;
-		amd64) iarch=x86_64 ;;
-		*)     die "unsupported architecture: ${ARCH}" ;;
-	esac
-	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
-	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
-	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
-}
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
index ac67ccb901b9..6e45e716b406 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P//_p*}-19-g61de83c.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/app-crypt/seahorse/seahorse-3.18.0.ebuild b/app-crypt/seahorse/seahorse-3.18.0.ebuild
index a9164561378e..b2ed12f03202 100644
--- a/app-crypt/seahorse/seahorse-3.18.0.ebuild
+++ b/app-crypt/seahorse/seahorse-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="debug ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.11.91:=
diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
new file mode 100644
index 000000000000..6b7c28b8829d
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -0,0 +1 @@
+DIST ubuntu-keyring_2012.05.19.tar.gz 18495 SHA256 8b3bb00770c7b1e5c0abb215ecf8c383cb3b709292a52aeb1022b5556e768b69 SHA512 3f33099255af9aad1ae8ae845074e714dc846134f49934b221a74c21ef35af5172dc1d845d3819cb28f353abd23df690b15fa0e7f74f8e2a882ddef1ab150f54 WHIRLPOOL 3c0fb09c0295c036fd35d1d53f5aef7ea5d40228563c253dc2e232a059baaa9f443daad34e841fdd9bd216950fcfda81145b85606bc43e9b783cb723d6241c6e
diff --git a/app-crypt/ubuntu-keyring/metadata.xml b/app-crypt/ubuntu-keyring/metadata.xml
new file mode 100644
index 000000000000..6d2298876faa
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/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>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild
new file mode 100644
index 000000000000..90a1b93a4665
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="http://packages.ubuntu.com/vivid/ubuntu-keyring"
+SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
index 148b84314a61..f659f814ef36 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0/9" # subslot = suffix of libgdict-1.0.so
 IUSE="+introspection ipv6"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39:2[dbus]
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
index 659b93645e9b..f14b10a2060d 100644
--- a/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="!<=app-office/gnucash-2.2.1"
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
index 77d3faa30dee..7e3576106130 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 
 IUSE_plugins="charmap git terminal vala zeitgeist"
diff --git a/app-editors/gedit/gedit-3.18.3.ebuild b/app-editors/gedit/gedit-3.18.3.ebuild
index c7b16adada7e..455abdaa13e2 100644
--- a/app-editors/gedit/gedit-3.18.3.ebuild
+++ b/app-editors/gedit/gedit-3.18.3.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="
 	python? ( ^^ ( $(python_gen_useflags '*') ) )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="
diff --git a/app-editors/ghex/ghex-3.18.0.ebuild b/app-editors/ghex/ghex-3.18.0.ebuild
index aca99daf6040..cfaff3fb49c2 100644
--- a/app-editors/ghex/ghex-3.18.0.ebuild
+++ b/app-editors/ghex/ghex-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/latexila/latexila-3.18.2.ebuild b/app-editors/latexila/latexila-3.18.2.ebuild
index eaa433197844..b2bcfdef0e36 100644
--- a/app-editors/latexila/latexila-3.18.2.ebuild
+++ b/app-editors/latexila/latexila-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection +latexmk rubber"
 
 # gspell-0.1 is required for this cycle
diff --git a/app-emulation/docker-swarm/Manifest b/app-emulation/docker-swarm/Manifest
index 11b40d44caa3..0e7a64519307 100644
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@@ -1,2 +1 @@
-DIST docker-swarm-0.4.0.tar.gz 853254 SHA256 c3ee1a34ce86da4d31f652c871dfa120fc78d5cc835e391034d740e83b48f7a3 SHA512 ffaa5560d67cafcc97b091d87b7792d6a0bfed2fb08837854a8313175742d535ee671fe45c4b96eeb69bf613a31e2e37cf92524f93ad20fbfbd54647b956c9c1 WHIRLPOOL 3acb07bfbcf33d70dffbfff4c5028767f36d51bd3500143d50e109d062cfd0107dfdc9f45724d08f874d81e15429089ed18a664fd591c26d7f2ff14ea933f93a
 DIST docker-swarm-1.0.1.tar.gz 1187966 SHA256 33c6566af395affbf9861d1491613c48a70e6c61c532910cef2210be7b1323f7 SHA512 ed5e6a37cd0f5a816367cab451d21ac20183f8ce767a30dc3086f849da8e0d2662c9f9b7e56d826e7e8cf5d4ec3d9f1ee8c159cca294af7ec45c2c1a21eaaf80 WHIRLPOOL e17705a3bef077e5fed552131aa7cd4891934a537dc93bbb8dfe81bf2e82c281d7f74a5150febdde26f492cf5ad4eec8417aac9a7edc6e48812f4af3ed1b624e
diff --git a/app-emulation/docker-swarm/docker-swarm-0.4.0.ebuild b/app-emulation/docker-swarm/docker-swarm-0.4.0.ebuild
deleted file mode 100644
index bb35aaeb8a82..000000000000
--- a/app-emulation/docker-swarm/docker-swarm-0.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGO_PN=github.com/docker/${PN##*-}/...
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="A Docker-native clustering system"
-HOMEPAGE="https://docs.docker.com/${PN##*-}/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=""
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN%/*}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:${S}/Godeps/_workspace:$(get_golibdir_gopath)" \
-		go build -v -work -x ${EGO_BUILD_FLAGS} -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild b/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild
index bb35aaeb8a82..cc963c2c0349 100644
--- a/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.0.1.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 RESTRICT="test"
-DEPEND=""
+DEPEND="!!<app-admin/consul-0.6.3-r1"
 RDEPEND=""
 S=${WORKDIR}/${P}/src/${EGO_PN%/*}
 
diff --git a/app-emulation/libcacard/files/libcacard-0.1.2-underlinking.patch b/app-emulation/libcacard/files/libcacard-0.1.2-underlinking.patch
new file mode 100644
index 000000000000..086508fca2c1
--- /dev/null
+++ b/app-emulation/libcacard/files/libcacard-0.1.2-underlinking.patch
@@ -0,0 +1,354 @@
+Fix underlinking issues caused by missing -pthread flag:
+* libtool: link: x86_64-pc-linux-gnu-gcc -O2 -pipe -march=sandybridge --param l1-cache-line-size=64 --param l1-cache-size=32 --param l2-cache-size=4096 -Wl,-O1 -Wl,--as-needed -o .libs/vscclient vscclient.o  ./.libs/libcacard.so -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4
+* vscclient.o:vscclient.c:function main: error: undefined reference to 'pthread_create'
+See also: https://bugs.gentoo.org/show_bug.cgi?id=494450
+
+--- libcacard-0.1.2/configure.ac
++++ libcacard-0.1.2/configure.ac
+@@ -69,6 +69,11 @@
+ fi
+ ])
+ 
++dnl Pthread handling
++AX_PTHREAD
++CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
++LIBS="${LIBS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
++
+ dnl handle the passthru option. passthru allows you to access the cards directly
+ AC_ARG_ENABLE(passthru,
+ AC_HELP_STRING([--enable-passthru], [allow passthru mode]),
+--- libcacard-0.1.2/m4/ax_pthread.m4
++++ libcacard-0.1.2/m4/ax_pthread.m4
+@@ -0,0 +1,332 @@
++# ===========================================================================
++#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro figures out how to build C programs using POSIX threads. It
++#   sets the PTHREAD_LIBS output variable to the threads library and linker
++#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++#   flags that are needed. (The user can also force certain compiler
++#   flags/libs to be tested by setting these environment variables.)
++#
++#   Also sets PTHREAD_CC to any special C compiler that is needed for
++#   multi-threaded programs (defaults to the value of CC otherwise). (This
++#   is necessary on AIX to use the special cc_r compiler alias.)
++#
++#   NOTE: You are assumed to not only compile your program with these flags,
++#   but also link it with them as well. e.g. you should link with
++#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++#   If you are only building threads programs, you may wish to use these
++#   variables in your default LIBS, CFLAGS, and CC:
++#
++#     LIBS="$PTHREAD_LIBS $LIBS"
++#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++#     CC="$PTHREAD_CC"
++#
++#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
++#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++#   PTHREAD_CFLAGS.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
++#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++#   is not found. If ACTION-IF-FOUND is not specified, the default action
++#   will define HAVE_PTHREAD.
++#
++#   Please let the authors know if this macro fails on any platform, or if
++#   you have any other suggestions or comments. This macro was based on work
++#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
++#   grateful for the helpful feedback of numerous users.
++#
++#   Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 21
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on True64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
++        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test x"$ax_pthread_ok" = xno; then
++                PTHREAD_LIBS=""
++                PTHREAD_CFLAGS=""
++        fi
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try.  Items starting with a "-" are
++# C compiler flags, and other items are library names, except for "none"
++# which indicates that we try without any flags at all, and "pthread-config"
++# which is a program returning the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important.  Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++#       other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
++# -pthreads: Solaris/gcc
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++#      doesn't hurt to check since this sometimes defines pthreads too;
++#      also defines -D_REENTRANT)
++#      ... -mt is also the pthreads flag for HP/aCC
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case ${host_os} in
++        solaris*)
++
++        # On Solaris (at least, for some versions), libc contains stubbed
++        # (non-functional) versions of the pthreads routines, so link-based
++        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
++        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
++        # a function called by this macro, so we could check for that, but
++        # who knows whether they'll stub that too in a future libc.)  So,
++        # we'll just look for -pthreads and -lpthread first:
++
++        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++        ;;
++
++        darwin*)
++        ax_pthread_flags="-pthread $ax_pthread_flags"
++        ;;
++esac
++
++# Clang doesn't consider unrecognized options an error unless we specify
++# -Werror. We throw in some extra Clang-specific options to ensure that
++# this doesn't happen for GCC, which also accepts -Werror.
++
++AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
++save_CFLAGS="$CFLAGS"
++ax_pthread_extra_flags="-Werror"
++CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
++                  [AC_MSG_RESULT([yes])],
++                  [ax_pthread_extra_flags=
++                   AC_MSG_RESULT([no])])
++CFLAGS="$save_CFLAGS"
++
++if test x"$ax_pthread_ok" = xno; then
++for flag in $ax_pthread_flags; do
++
++        case $flag in
++                none)
++                AC_MSG_CHECKING([whether pthreads work without any flags])
++                ;;
++
++                -*)
++                AC_MSG_CHECKING([whether pthreads work with $flag])
++                PTHREAD_CFLAGS="$flag"
++                ;;
++
++                pthread-config)
++                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++                if test x"$ax_pthread_config" = xno; then continue; fi
++                PTHREAD_CFLAGS="`pthread-config --cflags`"
++                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++                ;;
++
++                *)
++                AC_MSG_CHECKING([for the pthreads library -l$flag])
++                PTHREAD_LIBS="-l$flag"
++                ;;
++        esac
++
++        save_LIBS="$LIBS"
++        save_CFLAGS="$CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
++
++        # Check for various functions.  We must include pthread.h,
++        # since some functions may be macros.  (On the Sequent, we
++        # need a special flag -Kthread to make this header compile.)
++        # We check for pthread_join because it is in -lpthread on IRIX
++        # while pthread_create is in libc.  We check for pthread_attr_init
++        # due to DEC craziness with -lpthreads.  We check for
++        # pthread_cleanup_push because it is one of the few pthread
++        # functions on Solaris that doesn't have a non-functional libc stub.
++        # We try pthread_create on general principles.
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++                        static void routine(void *a) { a = 0; }
++                        static void *start_routine(void *a) { return a; }],
++                       [pthread_t th; pthread_attr_t attr;
++                        pthread_create(&th, 0, start_routine, 0);
++                        pthread_join(th, 0);
++                        pthread_attr_init(&attr);
++                        pthread_cleanup_push(routine, 0);
++                        pthread_cleanup_pop(0) /* ; */])],
++                [ax_pthread_ok=yes],
++                [])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test "x$ax_pthread_ok" = xyes; then
++                break;
++        fi
++
++        PTHREAD_LIBS=""
++        PTHREAD_CFLAGS=""
++done
++fi
++
++# Various other checks:
++if test "x$ax_pthread_ok" = xyes; then
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++
++        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++        AC_MSG_CHECKING([for joinable pthread attribute])
++        attr_name=unknown
++        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++                           [int attr = $attr; return attr /* ; */])],
++                [attr_name=$attr; break],
++                [])
++        done
++        AC_MSG_RESULT([$attr_name])
++        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
++            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
++                               [Define to necessary symbol if this constant
++                                uses a non-standard name on your system.])
++        fi
++
++        AC_MSG_CHECKING([if more special flags are required for pthreads])
++        flag=no
++        case ${host_os} in
++            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
++            osf* | hpux*) flag="-D_REENTRANT";;
++            solaris*)
++            if test "$GCC" = "yes"; then
++                flag="-D_REENTRANT"
++            else
++                # TODO: What about Clang on Solaris?
++                flag="-mt -D_REENTRANT"
++            fi
++            ;;
++        esac
++        AC_MSG_RESULT([$flag])
++        if test "x$flag" != xno; then
++            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
++        fi
++
++        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++            [ax_cv_PTHREAD_PRIO_INHERIT], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
++            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        # More AIX lossage: compile with *_r variant
++        if test "x$GCC" != xyes; then
++            case $host_os in
++                aix*)
++                AS_CASE(["x/$CC"],
++                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++                  [#handle absolute path differently from PATH based program lookup
++                   AS_CASE(["x$CC"],
++                     [x/*],
++                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++                ;;
++            esac
++        fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test x"$ax_pthread_ok" = xyes; then
++        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++        :
++else
++        ax_pthread_ok=no
++        $2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD
diff --git a/app-emulation/libcacard/libcacard-0.1.2.ebuild b/app-emulation/libcacard/libcacard-0.1.2.ebuild
index 78a3c4b1a49b..065ba5d801b2 100644
--- a/app-emulation/libcacard/libcacard-0.1.2.ebuild
+++ b/app-emulation/libcacard/libcacard-0.1.2.ebuild
@@ -1,8 +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=4
+EAPI=6
+
+inherit autotools eutils
 
 DESCRIPTION="Library for emulating CAC cards"
 HOMEPAGE="http://spice-space.org/"
@@ -17,6 +19,14 @@ RDEPEND=">=dev-libs/nss-3.13
 	>=sys-apps/pcsc-lite-1.8"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	# --enable-passthru works only on W$
@@ -26,5 +36,5 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || rm "${D}"/usr/lib*/*.la
+	prune_libtool_files --all
 }
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
index a5ccb744bdff..0ce6e0862ab3 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection python +vala"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/app-emulation/rkt/Manifest b/app-emulation/rkt/Manifest
index d74b026c6ca6..3da236a5088f 100644
--- a/app-emulation/rkt/Manifest
+++ b/app-emulation/rkt/Manifest
@@ -1,2 +1,4 @@
 DIST rkt-0.8.0.tar.gz 1749853 SHA256 c9eb0126b8ff2f059d7cedaab17ca73dce256f342092c9bf4a7ae20661f2a5aa SHA512 4e2c27fb40cd3d27de062631105db3ea04ed902f48abb647a8e4de249478dd8a145ac0b77fd5b261cc680df1bcaa4067accb8a597def9b3963108e2c1f3d9d5a WHIRLPOOL f65ddd8908ec30cfefa06e60cd4d8cdb2099ab279b6350790eb3e436b88c792efe28cea53569f48d42f6eec682635a4212f16fea9d184e6baa97877a643e1106
+DIST rkt-1.0.0.tar.gz 2414183 SHA256 7e30b03fa51a34db095484c4b111c526e49bead4e33232e1b239090503d7ac97 SHA512 f176532486b68ebc15aae17cfcf31e0f97ce3afc96bfed1c4f918da41350ef21c170712cb071a8720f39ee757b7b9ba1e66730d6e12acb9753446b929801c4ff WHIRLPOOL b2fc3082693b474584292a6ec943a685826364632dc346b18233bf9b9d2feaf14981f4a7fcbd9e79b98c2466b2f24be9b57f6345c89aeea5d075cdbeee26aba5
 DIST rkt-pxe-738.1.0.img 151780780 SHA256 805a4c491281553c8927f3dd1a7bec50cca29209d0a7264870e7155d794ecbe6 SHA512 7774cc64dfa874f08f48cba0c15103e9eca86ffd87dcb24f765a9b56074e72f6862a663a4007a0a7dd296740ae91bf4edf7290fa35659b0b1572fe2f5dad3256 WHIRLPOOL 5973a6036d650c576bb0bd365c8c9ea35776501c1fd2baf1d7c00d06496fab35e9c796096ef89b095e7a922e2062dce6c0d1c85cd3101022e0aca84277d18cb9
+DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
diff --git a/app-emulation/rkt/metadata.xml b/app-emulation/rkt/metadata.xml
index 5616198ef171..33d47776dd7f 100644
--- a/app-emulation/rkt/metadata.xml
+++ b/app-emulation/rkt/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
 	<longdescription lang="en">
 		rkt is a new container runtime, designed for composability, security,
 		and speed. Today we are releasing a prototype version on GitHub to begin
@@ -10,6 +14,7 @@
 	<use>
 		<flag name="actool">Install the actool for ACI manipulation</flag>
 		<flag name="rkt_stage1_coreos">Download and use a prebuilt stage1.aci from CoreOS</flag>
+		<flag name="rkt_stage1_fly">Build stage1-fly.aci</flag>
 		<flag name="rkt_stage1_src">Build the stage1.aci from source</flag>
 		<flag name="rkt_stage1_host">Assemble stage1.aci from host binaries</flag>
 	</use>
diff --git a/app-emulation/rkt/rkt-1.0.0.ebuild b/app-emulation/rkt/rkt-1.0.0.ebuild
new file mode 100644
index 000000000000..858b0c342316
--- /dev/null
+++ b/app-emulation/rkt/rkt-1.0.0.ebuild
@@ -0,0 +1,103 @@
+# 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="794.1.0"
+PXE_SYSTEMD_VERSION="v222"
+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 )"
+
+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 +actool"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly )"
+
+DEPEND=">=dev-lang/go-1.4.1
+	app-arch/cpio
+	sys-fs/squashfs-tools
+	dev-perl/Capture-Tiny"
+
+RDEPEND="!app-emulation/rocket"
+
+BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_configure() {
+	local flavors myeconfargs=(
+		--with-stage1-default-images-directory="/usr/share/rkt"
+		--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
+	)
+
+	# TODO:
+	#  - fix rkt_stage1_kvm to not download kernel sources with wget
+	#  - fix rkt_stage1_src to not download systemd sources with git clone
+	#  - fix rkt_stage1_host to not fail during launch
+
+	# enable flavors (first is default)
+	use rkt_stage1_coreos && flavors+=",coreos"
+	use rkt_stage1_fly && flavors+=",fly"
+	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+	if use rkt_stage1_coreos; 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_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_coreos; then
+		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+	elif use rkt_stage1_fly; then
+		dosym stage1-fly.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-emulation/virtualbox-additions/metadata.xml b/app-emulation/virtualbox-additions/metadata.xml
index ff95e9c2ad46..c7be278b6458 100644
--- a/app-emulation/virtualbox-additions/metadata.xml
+++ b/app-emulation/virtualbox-additions/metadata.xml
@@ -5,8 +5,4 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-bin/metadata.xml b/app-emulation/virtualbox-bin/metadata.xml
index 606af8f29e3b..8c28d5495ef9 100644
--- a/app-emulation/virtualbox-bin/metadata.xml
+++ b/app-emulation/virtualbox-bin/metadata.xml
@@ -1,10 +1,10 @@
 <?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>
+        <maintainer type="project">
+                <email>proxy-maint@gentoo.org</email>
+                <name>Proxy Maintainers</name>
+        </maintainer>
 <use>
 	<flag name="additions">Install Guest System Tools ISO</flag>
 	<flag name="chm">Install kchmviewer binary to enable online help (in MS CHM format)</flag>
diff --git a/app-emulation/virtualbox-extpack-oracle/metadata.xml b/app-emulation/virtualbox-extpack-oracle/metadata.xml
index ff95e9c2ad46..c7be278b6458 100644
--- a/app-emulation/virtualbox-extpack-oracle/metadata.xml
+++ b/app-emulation/virtualbox-extpack-oracle/metadata.xml
@@ -5,8 +5,4 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox-guest-additions/metadata.xml b/app-emulation/virtualbox-guest-additions/metadata.xml
index 4ed7567d1ee4..c7be278b6458 100644
--- a/app-emulation/virtualbox-guest-additions/metadata.xml
+++ b/app-emulation/virtualbox-guest-additions/metadata.xml
@@ -1,10 +1,6 @@
 <?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>
   <maintainer type="person">
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
diff --git a/app-emulation/virtualbox-modules/metadata.xml b/app-emulation/virtualbox-modules/metadata.xml
index a4aa4afb294a..62fc44fdd899 100644
--- a/app-emulation/virtualbox-modules/metadata.xml
+++ b/app-emulation/virtualbox-modules/metadata.xml
@@ -5,10 +5,6 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
 <use>
 	<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
 </use>
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 2e30fb880106..3dd12a57e6f4 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -5,10 +5,6 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
 <use>
 	<flag name="additions">Install Guest System Tools ISO</flag>
 	<flag name="extensions">Install extension module packages</flag>
diff --git a/app-misc/bijiben/bijiben-3.18.2.ebuild b/app-misc/bijiben/bijiben-3.18.2.ebuild
index 064c8693059b..d271a20a0b6e 100644
--- a/app-misc/bijiben/bijiben-3.18.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="zeitgeist"
 
 RDEPEND="
diff --git a/app-misc/geoclue/geoclue-2.4.1.ebuild b/app-misc/geoclue/geoclue-2.4.1.ebuild
index ab0513220c5c..9926a5269c7d 100644
--- a/app-misc/geoclue/geoclue-2.4.1.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="+introspection +modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/gnote/gnote-3.18.1.ebuild b/app-misc/gnote/gnote-3.18.1.ebuild
index b8c8e82a2625..052aa7deb0ca 100644
--- a/app-misc/gnote/gnote-3.18.1.ebuild
+++ b/app-misc/gnote/gnote-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug X"
 
 # Automagic glib-2.32 dep
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
new file mode 100644
index 000000000000..58de49634b78
--- /dev/null
+++ b/app-misc/tmate/Manifest
@@ -0,0 +1,2 @@
+DIST tmate-2.2.0-upstream-patches-0.tar.xz 6784 SHA256 aa5b0ca858bb652418aa5200f0f5dcda0827295c16fb73fd34594d718a65878a SHA512 3e16e0b7988d3d1942fcac0a535d2cc8d7156d26332dc84fd21c4761afae40159282b0fbeb71cd5f6525b5a1c7a46e7813c8e6a11851592077570c1a001a73a7 WHIRLPOOL fb05b5d90f2542bb2e8fdc8c5df988338d5626bd48899697b8c16b9078ca71d2b2682c648f5f7c37ed8cd4a9966b1c6d5524823b34a4ac4cb9833a62325bb39c
+DIST tmate-2.2.0.tar.gz 610793 SHA256 932148b24d9c67e524ce744c9480b5603c9f976afb6ad7ca6d63246cd9e7fd3a SHA512 e9429833cdb8c28873d01bfc6b9a0d1241e30346ef1b3efae6763389c8444943b831283c1ea65e49c68d11936d6586186b38e0f7c14d373d9f63e841026c3338 WHIRLPOOL e1a2203e9a63466244d9d61e6e06d4dea77a9eb3e7069c1c87c115e5ce370e3b3b7ad2d7fc8b4c740030ee980b4d52833066f853a05d1c611a5d5c4810c89a36
diff --git a/app-misc/tmate/metadata.xml b/app-misc/tmate/metadata.xml
new file mode 100644
index 000000000000..3398ef8b263c
--- /dev/null
+++ b/app-misc/tmate/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>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-misc/tmate/tmate-2.2.0.ebuild b/app-misc/tmate/tmate-2.2.0.ebuild
new file mode 100644
index 000000000000..f58ded2db269
--- /dev/null
+++ b/app-misc/tmate/tmate-2.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit eutils autotools-utils
+
+DESCRIPTION="Instant terminal sharing"
+HOMEPAGE="http://tmate.io/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+UPSTREAM_VER=0
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${UPSTREAM_PATCHSET_URI}"
+
+RDEPEND="
+	sys-libs/zlib[static-libs?]
+	dev-libs/openssl[static-libs?]
+	dev-libs/libevent[static-libs?]
+	dev-libs/msgpack[static-libs?]
+	>=net-libs/libssh-0.6.0[static-libs?]
+"
+DEPEND="${RPDEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply tmate Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	autotools-utils_src_configure
+}
diff --git a/app-misc/tracker/tracker-1.6.1.ebuild b/app-misc/tracker/tracker-1.6.1.ebuild
index edee4792e3a8..3009e3d07b42 100644
--- a/app-misc/tracker/tracker-1.6.1.ebuild
+++ b/app-misc/tracker/tracker-1.6.1.ebuild
@@ -18,7 +18,7 @@ IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
 gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
 pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="
 	?? ( gstreamer ffmpeg )
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 02657c07ca4a..f8d4724d166e 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,3 +1,3 @@
 DIST vifm-0.7.2.tar.bz2 468086 SHA256 f95e49a8518dd1acc9b7b750658a98bcf1cb538e25520a5a300b5812108fbc8d SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9 WHIRLPOOL 9c954dbe659e3303315642738bafb962f6f20820af0fe587b3c525ad7a93aca3f9090fe5d2d871a291ce95c9add81f7d717ae5adbdcbe2a58d2889e0bf3e50dc
-DIST vifm-0.8.1-beta.tar.bz2 819256 SHA256 e0e3e4d7cc06ac75e4acdd1c03f1b91e433b0df3ef817024e27bdc268f32b80f SHA512 873d6cecb3926395d48a3b56cd7c30f3dee930394c31c520d7eb4f12a6a938c632246b84f271dc98841eebe494fa1cf4b2c36bb560ad95574185dbdd47f888c7 WHIRLPOOL 5cde8d5010b7d96b142a662d9188f82f05ea41eb98372ab4628026bfc209b7afa991bd4fc3d9206c3b8e4cc251a20c056b5d11dff4752528c44c3152d92d5f96
+DIST vifm-0.8.1a.tar.bz2 832500 SHA256 974fb2aa5e32d2c729ceff678c595070c701bd30a6ccc5cb6ca64807a9dd4422 SHA512 3cd182fd52b8695468ceb9cb812b9b4e336c42ce101119c8423028403839d8b04fe2ece6d30830325d374cda93a82f0e1d4f427d5095545fa888a991dfcbc714 WHIRLPOOL 48ce3ca228aacfcaf36a80bb4440dbaf038785919aaeb19e1f069aea5b1a5941de4abfdb02cbc797e9848d0d746a1bd2df3e485d38bc1130de920a42fb01ed4c
 DIST vifm-0.8.tar.bz2 756795 SHA256 69eb6b50dcf462f4233ff987f0b6a295df08a27bc42577ebef725bfe58dbdeeb SHA512 b4727b7a9f577eb05c4e8830849a00759cbeb35457c8fa533136a0a68124312f2bb8c5c21239fbbd34f567ddaca247ede05e48e72b890bb4f15d12adebc23210 WHIRLPOOL 78d030cc9eda292ce75656eedc3ede3e02c87522517d7b7d49f0e993dbfc438a5b5e0dcf8fed531eeb1e045f01d5418d1e7fbc84cb53da800bb54d7ab4a636d7
diff --git a/app-misc/vifm/vifm-0.8.1_beta.ebuild b/app-misc/vifm/vifm-0.8.1a.ebuild
similarity index 93%
rename from app-misc/vifm/vifm-0.8.1_beta.ebuild
rename to app-misc/vifm/vifm-0.8.1a.ebuild
index f72a0efbe4e4..bec2322fba88 100644
--- a/app-misc/vifm/vifm-0.8.1_beta.ebuild
+++ b/app-misc/vifm/vifm-0.8.1a.ebuild
@@ -6,11 +6,9 @@ EAPI=5
 
 inherit autotools vim-doc versionator
 
-MY_P=$(replace_version_separator 4 '-' ${PF})
-
 DESCRIPTION="Console file manager with vi(m)-like keybindings"
 HOMEPAGE="http://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/vifm/${PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,8 +29,6 @@ RDEPEND="
 
 DOCS="AUTHORS FAQ NEWS README TODO"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	eautoreconf
 }
diff --git a/app-office/gnucash/gnucash-2.6.11.ebuild b/app-office/gnucash/gnucash-2.6.11.ebuild
index 78aa0f8afd46..604bd46404c6 100644
--- a/app-office/gnucash/gnucash-2.6.11.ebuild
+++ b/app-office/gnucash/gnucash-2.6.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
diff --git a/app-office/gnumeric/gnumeric-1.12.27.ebuild b/app-office/gnumeric/gnumeric-1.12.27.ebuild
index 7b107396d9bd..a5297b4d1894 100644
--- a/app-office/gnumeric/gnumeric-1.12.27.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.27.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="+introspection libgda perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index 40a419e1b4d4..778c657a4f85 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,2 +1,3 @@
 DIST ledger-2.6.3.tar.gz 551325 SHA256 e2c99d930fcf64b7fa901215c7fa25e3327f6365e8ee049620ef3632d53bf363 SHA512 825e670d25d2f8d1791480fb5da4190f7b342ecc9b47bca60fd6f0e606e5af5f3f767ec7043339660396ef4c90451f4a4122d812b8761acf4ea964b67dbd43b5 WHIRLPOOL e6d351ce8899079daa9cb0d1f9493b2b551a6d44e8ad7949c28ac8e544f80c87d54f06b350adfc21c4c8582e9042547313a506fa74096671bae30b462ae3e2df
+DIST ledger-3.1.1.tar.gz 842364 SHA256 90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5 WHIRLPOOL 89a83818adbe206167dbfc999dd589f1943d199cf84979fa82754f597a863c115fec85bbdabc4413714b4253502833170e6327bfc0d2321c392b9a3d73400061
 DIST ledger-3.1.tar.gz 817624 SHA256 eeb5d260729834923fc94822bcc54ca3080c434f81466a3f5dc4274b357ce694 SHA512 caa84330eee05d3e88820e8afd4a906d22f6aaa9de4abc2f6813636754e052e6ec4d1b3d2fce68215aededc72651405c62aaf16a2c1b69d34e1b10ffece48519 WHIRLPOOL fc3ce5e8eb59e1d4f83101063ebefd1379172c1be0e4f504079519924859b8127d616e7e3714837be49c7b38674b1684e321347d1f8561aeeba586b538341142
diff --git a/app-office/ledger/files/50ledger-gentoo-3.1.1.el b/app-office/ledger/files/50ledger-gentoo-3.1.1.el
new file mode 100644
index 000000000000..1c2c5bde2f8b
--- /dev/null
+++ b/app-office/ledger/files/50ledger-gentoo-3.1.1.el
@@ -0,0 +1,5 @@
+
+;;; app-office/ledger site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ledger-mode "ledger-mode" "A mode for editing ledger data files." t)
diff --git a/app-office/ledger/ledger-3.1-r1.ebuild b/app-office/ledger/ledger-3.1-r1.ebuild
index c1714fd590b2..67bff52a5a60 100644
--- a/app-office/ledger/ledger-3.1-r1.ebuild
+++ b/app-office/ledger/ledger-3.1-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$
 
@@ -18,7 +18,7 @@ IUSE="doc emacs"
 SITEFILE=50${PN}-gentoo-${PV}.el
 
 RDEPEND="
-	dev-libs/boost:=
+	<dev-libs/boost-1.58:=
 	dev-libs/gmp:0
 	dev-libs/mpfr:0
 	emacs? ( virtual/emacs )
diff --git a/app-office/ledger/ledger-3.1.1.ebuild b/app-office/ledger/ledger-3.1.1.ebuild
new file mode 100644
index 000000000000..b4338f9bc387
--- /dev/null
+++ b/app-office/ledger/ledger-3.1.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils elisp-common python-single-r1
+
+DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
+HOMEPAGE="http://ledger-cli.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc emacs python"
+
+SITEFILE=50${PN}-gentoo-${PV}.el
+
+CHECKREQS_MEMORY=8G
+
+COMMON_DEPEND="
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	emacs? ( virtual/emacs )
+	python? ( dev-libs/boost:=[python] )
+	!python? ( dev-libs/boost:= )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	python? ( dev-python/cheetah )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/utfcpp
+	doc? ( sys-apps/texinfo )
+"
+
+DOCS=(README.md)
+
+# Building with python integration seems to fail without 8G available
+# RAM(!)  Since the memory check in check-reqs doesn't count swap, it
+# may be unfair to fail the build entirely on the memory test alone.
+# Therefore check-reqs_pkg_pretend is deliberately omitted so that we
+# ewarn but not not eerror.
+pkg_pretend() {
+	:
+}
+pkg_setup() {
+	if use python; then
+	   check-reqs_pkg_setup
+	   python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Want to type "info ledger" not "info ledger3"
+	sed -i -e 's/ledger3/ledger/g' \
+	doc/ledger3.texi \
+	doc/CMakeLists.txt \
+	test/CheckTexinfo.py \
+	tools/cleanup.sh \
+	tools/gendocs.sh \
+	tools/prepare-commit-msg \
+	tools/spellcheck.sh \
+	|| die "Failed to update info file name in file contents"
+
+	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build emacs EMACSLISP)
+		$(cmake-utils_use_build doc DOCS)
+		$(cmake-utils_use_build doc WEB_DOCS)
+		$(cmake-utils_use_use python PYTHON)
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_make doc
+}
+
+src_install() {
+	# Prevent installing ledger.so into python site-packages.  It's an
+	# unnecessary copy of libledger.so and generates security warnings.
+	sed -i -e '/python/d' ../${P}_build/src/cmake_install.cmake \
+		|| die "Failed to disable installation of ledger.so"
+
+	enable_cmake-utils_src_install
+
+	# This source dir appears to include some helper code for serving
+	# reports to a browser ("ledger server").  I can't quite get it to
+	# work and the docs say it's a work-in-progress.  It's a little
+	# interesting, though, so I'll leave these installed as a preview of
+	# features to come.
+	if use python; then
+		mv python ${PN} || die "Couldn't rename python module static files dir"
+		python_domodule ${PN}
+	fi
+
+	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	einfo
+	einfo "Since version 3, vim support is released separately."
+	einfo "See https://github.com/ledger/vim-ledger"
+	einfo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
+
+# rainy day TODO:
+# - IUSE test
diff --git a/app-office/ledger/ledger-3.1.ebuild b/app-office/ledger/ledger-3.1.ebuild
deleted file mode 100644
index 6cdf9d9a5148..000000000000
--- a/app-office/ledger/ledger-3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
-HOMEPAGE="http://ledger-cli.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/gmp:0
-	dev-libs/mpfr:0
-"
-DEPEND="${RDEPEND}
-	dev-libs/utfcpp
-"
-
-DOCS=(README.md)
diff --git a/app-office/ledger/metadata.xml b/app-office/ledger/metadata.xml
index 9d91b41fc7d9..56dda141644b 100644
--- a/app-office/ledger/metadata.xml
+++ b/app-office/ledger/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>stasibear@gentoo.org</email>
+  </maintainer>
   <maintainer type="person">
     <email>yac@gentoo.org</email>
   </maintainer>
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index dc9cc6f6845d..87406ad05978 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -669,3 +669,171 @@ 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.0.3_Linux_x86_rpm_helppack_am.tar.gz 7446416 SHA256 14a336e1de4e26a1da31dc1676f406375dc4a6f76d28b76aadc30c74a728777c SHA512 ffec981aaa57dc1ea503f876fc075c75a9470ebd72978fc03a7c76cef9f676d97c727c1dd820e0232e72f32d99c32c680e383097477485a7959b7cb774678af2 WHIRLPOOL 1fbbcf26e5c27aeadd8663b9d92c52082015e5dc779da4171768bf0cf13b27b16d2739b08516f9a97a91beb70b9c978bf565a50496377b493dd1b61ce6259cb3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ast.tar.gz 8092768 SHA256 141c77bf7d8bd8e76ce2afe7560dfb340f2a0765e6635ad2229a1ba12ddba776 SHA512 37495b630a245040983be02b09e87d08bff2346f3dd028f16281d6d63d89c474a7d46a9cf4ffd3c86f0772e850eb09f7e3150e1f044b12347b3fa0fab4828bc6 WHIRLPOOL 5ad3e02a6c84cac04bee4d02d85aaafffc014d5c6c4ad79058a5324182337c523c732e8c13947b610fe896079581da6323b9111f4b21b40320ebf444bb4d8c0e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bg.tar.gz 8326123 SHA256 3a3ceffabf96fea468f4c758a7221839291181814e625fc63b7d2d43d21c64d8 SHA512 303afdc475e91f4e69a4eacce94ef16c4df948c1ff68d2386b33445546066a8dc87d29d345a5cf486322a1a4bbf51d8fffe391f6a582505a55f800d064614914 WHIRLPOOL 4dd845e8aa243678b10a6fc40244714a5cba20f36af40cb5ae54fc1404a7d165d6b533247dc1b210c3117749361aea17cb9a0bc0669b7318802eb055d548ac51
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz 9831903 SHA256 e9188730cd060fc2c7acf6969e9e817b49ae2da0ffd2b52e646a669d07956550 SHA512 f0b812b800e682691ddddab2bc54b297bec547b953297d6a7c28fb8f6fa1d412c5cffa251f9700552deb8966ebebd7b21b2803db52d1d6b8a35251da0b7750d9 WHIRLPOOL c0adb2087fd6909db3bf35f3db8f32ed92486b43a86aa6b1a9a708e773f3ea2a88b51f0db5a6458d222f4c46e5a0e4932f48a85c24d7bf85fe60d0cc186e474e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bn.tar.gz 9831977 SHA256 da2ab310ccd497d971d11d2ce1db5c33f5c7effaa3557a8a68a97ebe47660075 SHA512 a59235ac78897456334058686cd7f33b76b0a792b25f926972316a5cb64f71ecffc10e69154a3ca4a68fc821a0b1a433da495fb420b150977e7aff5d0dda8cb8 WHIRLPOOL 2440fee4d11631c7852ff4969cd3f36673b9e00023a0f74b9793294fa935302080b8eec32096e154d3ca08c3156dba8da8378ac66723b0ccd88e156167d4e625
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bo.tar.gz 9494419 SHA256 418ada459d23f737c8126b81e34da1274cf6d602c5ed1a196f336d3947768d9d SHA512 6e82d97973ed128b2e24e2c58b4cc9077b9f2edc39dc334d6d36024b92ac994eca42251ed8c8e99c675a73204f70ba2856e2f27b30c62f994e6373799170519e WHIRLPOOL 51312fcde9e15a9de0464feec3ddb1110d066e73720e71c4ab64f97a3ddce7ef55233db2255d384c2d1c951879db6cc3625941e704256230733cc952b5f1dbe9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bs.tar.gz 7132220 SHA256 f57b5dcc43a4907f0b5393d17928e05ed04f9b3ec7c7e4381a9d9c1369204359 SHA512 d5bd1a360acd88d4171481b51029dc798ba164beb6645f85c17990a477d714e65abe8056b0a15a007d84a2f48eda525f626f7ec9ebe6331097cd8187f8da1334 WHIRLPOOL c04af11850bc0a1de3cfdb67af3be191e32a3832668e4a76269cf22291ac2bd849633c2a384b5a5a2183e046ca7eef9100313d0922862b1eab1f37ff0148c3b5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7965371 SHA256 b14022532cb00350bd295c51a93c3adf311e0fe2b901519d0992bf0bddcefe12 SHA512 f034655de6811983be9a69438f4ccb881fb52d74395167a49225a4fc5ce745b64aaca5a10784868539b5a075a5cef426f2cb176413f2f9ac32c6f368e3aa1857 WHIRLPOOL 9ed1b537ff7c684d95bb977da6d683804115946dd00f08d61b7223e756dea8b81d73df97e21390a7d37a51936d69de20a8f7eddf84e78910dec8c247552ac804
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ca.tar.gz 7951561 SHA256 33240b2c20e588275e5b0100b175919ffbc11993280332e6eb54b5d5aefa77fa SHA512 2b406a7f5c595916d2c799893f76e9891a01b8a46bf55436a0f3aeeebe9f68fff2d8238ceeb2e3e8221345a44e786f8f128198cc47bc0a15648be92af457924f WHIRLPOOL e2be9fd5434af7d6465167497cb849e33c805e7ccdbd6e986ae4afb75e731a25fc9f9ea6d64e1353b2811b31235b641bd07cb0f0e8e894a1a87ed6224af003f7
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_cs.tar.gz 7583166 SHA256 4290b0e8ca6c5e021df89a914b887780cfc73f7211d144114a10d2f0781c744f SHA512 74a31f59e7bca0b9d5ad9ce5e62948c0edc5cde6dfa8016e6342a9b465d077d92b19bacb9094e61334495888f15685eec4dbd27f89fae58e74f45fe3462334b5 WHIRLPOOL 7abeb59beb5faa755ffccb6518570b41341401f32c515049f293b496816150618e82f85cdcf9a6ae65845b939948ddfa7ca88ac6f38477412dec1882d4e0b0e5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_da.tar.gz 7586801 SHA256 7fe28e97ac9df0edc576101858ce294eb9aaf3b0eccec25eab214d621207255f SHA512 95244940deb2d325d4e9bb66741e19e590e4eeaf8755507450af0edcaf5fb2d0cf0a5f3a673a2fa905da628c1f3d9738a9007f5ae9a6b584f3ad37b94de2b70a WHIRLPOOL a6712c62172504aaebab179714eb8106f64b520e1f7b6b2fbe6f67a1676e7d1aefa8b1ce6187343ffe18a378a94b6f3a3417803c0d99ec3c54741b6d7d633236
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_de.tar.gz 8142664 SHA256 d9f4e7e823eb6b91583e76104a05620ad44136f1c7b6a079d175fd14c2fec688 SHA512 7ddf7bf3ce0c618c518113c9b55defdf9996691ab77ada211ad59e33c49cc44963b2fd272eaa9e387597459dbe9d278f675cc890a7dbc2f36fc8b9fe4ef90f44 WHIRLPOOL d9fe13f76e620f94c0420c04122ab821c8ed64b8adf9cfc9c07b8ded5dbc51ee6c6248ee6558aac35eef06ab1d4b7809134b441ebeab07f4169a03eb606029cf
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_dz.tar.gz 10385545 SHA256 e2e6925dd7e5d13e8a57c79769e3421935c421c3284c1f882b5ba37f71583401 SHA512 ff07dec517683a91abe94aa4ad8c70e890959da129165e26ce3eb346de60cc310b81ee14d3eceb9bedaaadbedb545c71637f9bbb65c2252d958e36e3affed469 WHIRLPOOL 6bd1fd9b29e9929f6093f875315482a4e7626ed70e4be2128bb612552801da5a852a79793ad06d3b60e9703a14679f6a8dc17c10a5d48f47abc0123dc1db0809
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_el.tar.gz 8974451 SHA256 e37365a271f1f6347203bd4bc151cf5ab42d7932812e2373caf9e2705c21f591 SHA512 39051be4918da5c7310079bb0bacd5128c57267993e7e9f6d2ca9629ae40d1d72e6e204eacfae1cf01be01c183c3cbcbad0a4e9c5e44ea08ae66c4276177d40a WHIRLPOOL 16f77b7534c8f2db152aff57c24364a1859875748bc4ee4d967b6d70c7b7faaf700fc1f8ceec449618236a629cb746c9d26633f1f90db0fbe54d65ceb98412e5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz 6442386 SHA256 5632b29840d78a998da0496e98e79f986f6144cd03fa4bd32f29021c1574d311 SHA512 4097e995a44a5b5db7cf78b48fe7f2527aa4f2d3f7862cbaa9b0c57986c8e7b49b7dee4d2521169d18850d2fb7e502ba713a94a39bc7f1c247833b03863a15ea WHIRLPOOL f2c45833f0ae67595369af064573d7cab6ae0efb99046efbb251535b0d1cf22408e4a9c2de47275b38e00f08c4676a02b62e41450755d259af785c092d921c5d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-US.tar.gz 6486346 SHA256 d65e8a48089a44981c362739635bf96eaaf475211a014fb03784dac0ee3c8737 SHA512 5b2ea004cc185f01a4bd7278abcbe2b4c30933bf84a1fa26d4ffa596565c637844582a25124c4d2de2ae6557c7aeaf22bbdb3ceb26140149143b4779e7fbabcd WHIRLPOOL cc2ed9bb104183a020f2f3162633245e66b12f910403c37cbec92e9b4fb44f1d787734d9bab3909ec1f8c775e31b46578602161375014a1aaf1bd2ebaba79ecd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz 6431990 SHA256 2d220a8546415678edb760e56f00855cbb628d715031389ce3e6c08a30cf11df SHA512 12bf6b9ec12c62e054ab83c48de303a95bc041c733e12c3038cc9c612247124fd9f861d8fee70a9d30be0b281060e28de3fb66c0865a717fc78dc54cea8a33de WHIRLPOOL a5538f6098a333ac40f081aa66d3436eacd0528aaff53062413bb29abcff01b4020a0f2f5baa2f2269ccde6c68a1c7ea5850d3a1976672df450d63eb44908931
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_eo.tar.gz 7014214 SHA256 666547baa43df35c8590d67b39178e22d2625ddf064f9d7d7cc716c6471b2d41 SHA512 339544575d80f0709792d5a52535ac53b97e00371d128dc8f7edc806f6af86b006c9c38cdb4d3c73e3f56f16f087334c2d2301a0bb6cccd9dc33963544143609 WHIRLPOOL ac44fab0392e0d668ca4f37a406e21ada367a0c078f5027a8326d235204bf0cfad41b27d00828f0aa6cc552afbb15ba6ef36b6275491e05cf336c5d4daaef44a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_es.tar.gz 8000149 SHA256 f3c30cd92a40898bc59d425d8de1820c8dd3aca724e8fa9642a4b61bc6e1a843 SHA512 b911eadec24854f018fff319b7f4143f0f84a0dcf3653193a4e34441ec1df4cc1fd58a934c97a382ebddd8645c0975b1e3761120270dffc63f16fed545825066 WHIRLPOOL 48b6d1b1e60c2ff46afee2f5b1d8f2d7d37d37aac1dbc9690e3eb4ba693b557d968e88a03650a8d85d5f1e40dd994c0103c728add820357619d7a7302d9f25af
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_et.tar.gz 7514323 SHA256 d0d3304d606686cd5bec6f74e012ff66cf5f3b6b931aee38975a1ff5b5ef2ac2 SHA512 e8f72885491726e5d7b3bff65a9666b3f006c0eb7c4da5e90fea82a46bc2c85ce6b4809758007c345352b88ebe832da8ba84be34edfb33274e06fb00f14cd4f3 WHIRLPOOL 19c57f77ee65e453add44410c32b226355bc3baaf2384944b495099f5d0d2121518bbb9d587d41516bf4f7c28249a0e59cb8ebab298281a84293c6f3adfc24f7
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_eu.tar.gz 7648892 SHA256 2e688a9dea2374a098d4f1f110b968292e16a2e87ff3f6605c529a356e20aa7f SHA512 791f95028c54a3ab19b731b1de4bc91c7dbd82b2138474f6235ffd40f6c68aa455ce9715abf041518a3d8e37a697ba4a1a303404b581e5885d4f07578b079800 WHIRLPOOL c080f8fd5e80dc36c150db35885618ed9a20d3d5c89e2e8d0db051cc2b107d47c93693c7ffa8788ca77a2cced8c75d873c018fc362704832170e234eaace5d22
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_fi.tar.gz 7799595 SHA256 fdf099b504ac5402dc49c9ce5ab7c4cfd3a891149f9ef70efc2ba240e7dbef80 SHA512 bcfb33ce842d5ad11756d6839ea9cc3250573d7d82494a356932fbe057e95b35f09544e510f8903aa2bcaee7cd62b2b2ce8e815890a6a73a0f87c55bb55116ca WHIRLPOOL 7ae72427f7cec47eee6e4c2475731fb3a49c273f5e76812bb514751c8e9e067a5c7ff50f53b1e65c82dcf1d572731feb83d3434f1655872d6720dc926a7e5d67
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_fr.tar.gz 8182124 SHA256 120e947bc81884c5c550bb6f80af7f426797b82fb8ca0af8ae4c765e2943ed87 SHA512 ec4cb31842a01e731adb43b44d04defd343d8411d1e3d5883960bb8aa99ebe0da7a60d4f1ab06b27ba2f1450809d1fca83e354a8c96abff884c291b7a908d72d WHIRLPOOL 66de18a1ed30b3a88b08a026bd255eae927c4e5f88e6eb2acd03d3a71c4ca0501485b78cbc913a985921d3a81362d3a398fabd5d5a0c4cd94e4aa880d4e5fdd7
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_gl.tar.gz 7732071 SHA256 5a140c2ee496e25b8b4b809465c69796dd1a553dec9ae307b75882e9d6153831 SHA512 b2806a6b043640a073b44a10a6f098e4969263eb26f95507c9599b24431decbb710a92f3ac294ebe9d70e8e337c916d03eb1a90c738f69d04fe9b25291914900 WHIRLPOOL 88b58c0685d68e2416084fe0431f083de4efdc20dc141ac69c2b9a44843921bd97157f30324cedf18cc601134f0a6f4c42585e12f940a3d94cfb9592bc254215
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_gu.tar.gz 6654531 SHA256 ec6379cbb6531fc4da4c531beb0b04aba2d5f95ac4d3afb342e9702fc00f9ca1 SHA512 d2a4d142ae512e66f72f1217c5301441e43bcc3ef584396d06921d23960bf718cfdefd12fabb7dda14e6eadcd09699f8609404260a054eb818afa4ac4d88baad WHIRLPOOL 037ff271ca952b57c11d8e848e37d3c6722cdac03ec9924641b182433341c73f0220bb157bcca298029d6cb15631e4b95aeb3400a800451b32ce22c1dca7447c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_he.tar.gz 6269851 SHA256 24391fa19abd5443ed4c0e5d931f4d681d6c38ef07d008cdd80c1adaacdc1024 SHA512 86512e10fe2e52e121577611137a6c0fa54911a5474133b0575781406cfab316d16453def08995462c1032c4e299da9dbfa558e0700f8038dc45c4deea2c3011 WHIRLPOOL 9c88e5ad3d37f8695968c4d40a460a059e20edea729254c4f7882be492d24929797c384e32fd2ce98636689d8538cbb508f7d3d9fe25a9b19b24635e78bda81d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hi.tar.gz 7334596 SHA256 554db897271abb8ba03712720b12bdb7ee843b605d313811c748e0c6c084a34b SHA512 8c23e41e7017fd00f606d7b840cabaaf9de586a3b467f4453c593334a5ddb617585905e5ba1a9e9f3143c323d5232c4f1f218d931f47319eaa105d7409bac30f WHIRLPOOL c8294f81380280f8e125437be9ebe90696f2b442d89289773864023a46efa3efdfd9378b58c5a641dbb1e304eaa29687aabb14b1c64d4f615ff500e533d60098
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hr.tar.gz 6818624 SHA256 9a7c4ee3b7e2b0f69ccf34acef21862bfe97c2d75ea04557b465e8fc3afa8eae SHA512 1379e843a91f3f91d0cf6a00acadf9a8933e995eb9da91d7072d50ee71e525674981930cb43ede5694cb1cf9d925aea90030c5a384eb2e576310c5896796c109 WHIRLPOOL 9fee9ba233446047f30ba2ae374e58f7a5a1193224b612f84763711bdd01cb71b7141b2d356d9bfd5c5e9d1da5bd8df74e71eaaef3170c7e98c62f2986bc68bd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hu.tar.gz 8010059 SHA256 bf4c8528a4bcb75cedbe75ba63ca5acc143d71388ed97237e5b12b31e86d57cf SHA512 090cae60253dee855c24c2c9330df565430f33a12ddccf8a7fb1e2c75f24fce7a5140f93e0dde7e11b43faf049aba11693afeaac19a7799828e6c3bbe1b1f21e WHIRLPOOL ea3f2435d831f0d7aba064e0ab7f5a70190ebde5018aebd7a1feedba7e101e1333d228b8004f65f1e9d6491d62a9bf730977f201c1184f2633a7f729009e42db
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_id.tar.gz 6814516 SHA256 b5b5a6218c540f1eb7e90ea75adab5ef6558233aa6a8d8e8b1a23468756beaef SHA512 2a222f29712f32bfaf78dc21228a8707166fb0a183a25db01732159cfea391c03a88524b7329e051031db2fcab046824bb187ea4313cd4eb164e74d3e41213b1 WHIRLPOOL cdcb49293a2a48c14a23400b3898c31a1e82cb93f2f4b19309857eec4d822a52ad00ac8e37492b69548e29a0a7858e589e78beb56438f8742d5c6628b13e39e6
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_is.tar.gz 6922757 SHA256 c6d5cfe360cf62f88303771f424cc5c6182383260f06afb475663b3b0f9d48a6 SHA512 4e4254202d18b986826a6c746885ef231c3cea4df15c4c3b20b246c237c070ef2c1a15972df3d57eb4f400aee5c5866a6a3c6893f6d3aff1eb732031926553d4 WHIRLPOOL c1b4965c0cc1931daeeb67795721298233131e1a6b287532621ae97a384c5a9284ec2f4709594337e41b01c7dc7c0e1cb27afa6988c39e0d363d9cc5f93c9472
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_it.tar.gz 7933411 SHA256 668094861e772ef939fa62dc670f3012ec8767271cfeb0235c67245996a96484 SHA512 40d4a3c91bd83e4305084b51a3cd5ebf62c3d3fe2500c60d8f7593ddcbd92c8330e1a423883a1340992e3c5d345d227ec61605e152e1321e7feae6ad0c8c75d2 WHIRLPOOL cba13568933dc82cdbcf3ae576585a94f76fea1d258f2a174a5d8d3fead558280b44e9891b15340659d3655cbe1ccbfd378917e9a481046564cf7f912ed4f6fd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ja.tar.gz 13446190 SHA256 c3ef645f01de9c8376b0653eba46c72b52397cdd917a8229790bb1c6b0751b3d SHA512 29e89bb6255920a39ff2617e622d83df9bac00883a701138073b3f55e8562eca737e28341cc3cc5ae61c1efb55308490bffe20c436f351fbc4e8e837edaeaf9d WHIRLPOOL f43f59461a0c5ce1a76a1be0db9507fbe2b9e45f2439a0f1871686649ec9f6c6985545b912484619b46a3b042813e651dd62de0c126434b9bdd296b70a8a7a2a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ka.tar.gz 7123711 SHA256 bf48cdadd87dd1f1979c3c35368c44dbaf64fda2d2f14dd2b686001386a96d36 SHA512 25f6f43b18ebd69c2e8974051b537b387db0d973bf7a1f9657317f47e7457b1b17e073a8649cd96ff81d4324e1b51fa622511d1087212ce11c59f3f5aeb519bb WHIRLPOOL 148aa1841140eb9cc5083f30df597210d4f1922ec366219e0359ebd5649f96f86ddb02cc4dbd5574238a073fc69cb84c334df84b5bc852f349df60ec068b547a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_km.tar.gz 10372833 SHA256 2b91e44317ecb60c9a1450e6da74e13a3f665a89f74d534178f1d10066f51be3 SHA512 7fa063730646dc925b5e66482b0638902332032d62b01c0a2a37cdae305b8ddaf20368ee4cefa1bc5b765c222f744af593675748febe20ab3e94d314b01e1f62 WHIRLPOOL fb6159bdb1b9379ec42cedabb143a07627f525e2cf022827e905c9cf472c9c8e7f5b3bbd7c04b86a25a97073dab1f39a6eab40ed79d42073643bc9f9e3fa0e17
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ko.tar.gz 9379969 SHA256 4d594752f69e2ecf3769829bcf08c1b7eaa6f4b802d5c81c98bba916f1402270 SHA512 da475c90508f9b36967abb6678e9be4f1366d82a1b59b1484ea5b8c68446539114cb7a1af22e2c8a73608dba723e4dc02984ff6e762f2c5558d861ee8cc7d50f WHIRLPOOL 2e978920eef0101f5de3bda59ada87894da8b5d9bbc0fc4e97531829a98d459e3cb3edb09c1b8eb2bfd7cdca0535dba68728390c2e3745d853322c5bf61f6883
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_mk.tar.gz 7358464 SHA256 536f179944ad6b815b288dd25460d3272f02c2c9a46d8e2a826df5302e019e86 SHA512 a69df9adc066037aeb41d99a8518f0430cd400f216d1d7313c34c52ac6caee1ca508402e7f65a78017e257271e41d320a2b205983ae9f43b5d2c21539378a787 WHIRLPOOL cf740cc7578950da77ae057501e9cfbbded5365ba8ade3b029b8802efe72b089a53ef27e0b50720bc635bd921e8be5e6cfb8b19bb13de161de76a6721b8a8226
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nb.tar.gz 7671175 SHA256 c942572cff98534ccc485ef96600c9bcc00e45ebb387692a60eb94429733698c SHA512 8cc3e5ce21243fa8bb260a26c55f2c59b7f340411f862ac0342ce88ace03961a0ec33eaf5f26229628cecd87bfa5da13f7fceefbf1e0e40f1f4b98d0d093c0e3 WHIRLPOOL f75f4ea03aa69cc8094b9db7e893c9abf2c36a0271763d5355d5cdb4f686b8f635141ddab99bc1026372c29d7c2c4481c7d5f638d8831b8a320c88cbfcb9c628
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ne.tar.gz 9859584 SHA256 5af30a788deb8b84c33bf1e5cf97a99abb9a98efa728ea4c20c068985648b809 SHA512 6480e7bb3a08ffd4059ce3111c66c56e9d254d300a6b7887a61f3d1737edeb1188fa997e469e1caded8800095036c7f4c7b6fb0a41c5f273072eeb9682e5797c WHIRLPOOL 5965af318878b8cba5a3f347633bb15442f134088081d433e1ee2ca9fee2d15781a196fac032d388e9448282b87bdd828eed0c01e311bb0de1ee04c3f08bd3fa
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nl.tar.gz 7752849 SHA256 7f423cbad71209c219041f6e71ed4a54c47a78cdf2dadcb8e9e905a2b6c68a68 SHA512 49c7b56beea3ef54141fed7f2ebf89df73ff6e8eb535c0dee67040e4764175a0d730a33d147e784e7505861178d570e28da5d9e4276f815579a6b01b3af92f9f WHIRLPOOL c74c18f88fdfbadfee1299101e27f494baf13188507e9c62e75c49c18c6aa4b7c412addcc066a713878984ed1a1b4b1939b3f3986163e59d4273f10a29603c37
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nn.tar.gz 7626682 SHA256 5b541569900737097669d9f3c617f287de4a9bf631d2ea817e08628e8235c63b SHA512 820bba43e55b2a9fe1406aefafe550fe2b2e94f1d3e0885acdfe063ead88a68d416990d598f0e01a95b120a106cf5fe79878986b5fe37018694eb4ccbe58fa6a WHIRLPOOL ed0e6ba259486bd9dd829437c662fa927b150e3ac4dd6a863253fe606ae38dfe7d4ddd3fccc6ae623a40c8fc7285e5d55ed8c1b02dae94d6b23c4b64b1ac12bd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_om.tar.gz 8003452 SHA256 1a7d6d291a0ee801c03ada3cf42b1ffc3f2e49485c537c883960eb0f04275091 SHA512 9ba02e8653a5139d2dced9cbe1b36b7646694a7e786662c6501eba94e5523b1ff9e99dd12bba397efdc96c7a0eb9454fac76a177deab8709f33f1a58eed1ffe0 WHIRLPOOL a098d8e6b83eff1748096b4838549d1fb5dfa193fe2a412b9b9c0e0ab793f8b780627e163056d42a26f154eaeb099bce9008ccb2fe06306f9b510214540a46da
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pl.tar.gz 8045607 SHA256 e81e3b929c411d4c5e0e37f8eb48df3994f54892fb6bc61207e7dd1e2035062e SHA512 7358ef52ca81e17297a7aa7dbf7d97016a8bcf54eec6cad0b6f41d303b4d451e737b4ba3c7fa900aa0710bb97f499ed511c2539f338fd50af5c3573d468ec651 WHIRLPOOL dc0f532b4d4b1d65f40f6be39ac63b6a4ff0087b58313a48a03424679df0b7ea307f0c6e3bafd2cd9072fb84ad6da51bd78eb7e49db14d113828bbf05cb7c8b3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz 7760133 SHA256 b0fde34d03222e1470c5fb27353ed5148f486bd7ce0829712e8111a4c9ba4a06 SHA512 1adec195bdb606430976edd26800fc36fa2d9847d92aee5a2e93c38f08ad8fa949ce19febb7786bcf6728a718b7c0ed43b9ccbb1e3828b735af91b6da8c600dd WHIRLPOOL f7c04aaf054a373e55cfb962cd0cda50faac809b58e9292a2d3a8bb501609f6b65dc1710dddfe21edf782c895635295e2ec198278bc727d4dd00ff925e0f804f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pt.tar.gz 7688125 SHA256 62892b4b4a706c484fe5e4a75137e81b3ea58ade1fc8185231e1f2ee15c198b1 SHA512 4f0cd56cba5dc7264f3d3ba588d2302f4c89419480da805dab5f273470eb7f04a0f9b71a221530b51f83c280ec25cbe1b79b7a3002a343f0a26c8d7e75b12cab WHIRLPOOL 3d10655a2294ae5d25ed798758d909af96b8901034dcc84ddc2b66b7419e51db8415ce7e42cf74d69611c0f1ed4dd248b267ccb2f5c577341c3abb672b0eb025
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ru.tar.gz 8429254 SHA256 421fbd519bee4fa2ba5537140d513ecce607aa5f0246734546c02e011d8106f3 SHA512 cedcb6629ff6fc60e9f182b213280a4170ac69770eecdf2b99dd57c0960b0ee2c04af9568eb7bf8a6a29f47f9f3852815ab35905fdce5a83d9c8a117adfae3aa WHIRLPOOL c352723aa835fc244c56e8512840afd22c1255f5ba42b0bf6f8ad17af295c76a2faec4c6f74b28dbec4e3a8af95764a1d245d7deaf57097f5dd988b4077493e0
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_si.tar.gz 7210555 SHA256 04eb1887fdab5d19861ab31a47bff4ae9ef3ca5048fb44f14f67e3b053355baf SHA512 4fdc89442c078b4cc506557a6ce0c33d5d6b6ff5538e413d1ec7a55964a5cd486a2ada5b41fa8c82170455fd5a36d282d5a5e25883ead22d21d027d7bc51a5b6 WHIRLPOOL 1e7ff469c202462af05141e3d2d343710274a262cb2907d29da307b7c86a29e9b79f3a014478a7c5d27ab83a894f6423a28494786aec630b5c717c4acd79f8a4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sk.tar.gz 7513241 SHA256 a04a565175394c0a000d58b30c507e1d8acdf94cd15bf9c25a37337d463e2154 SHA512 c76753f74473d9d0060bb12c5cbb01829d423aca0e1e76445bd16a5c427c8709b49174fd32840090fc2428be1ea07d60d578b81da1e8045d71cbc5555f9b03c8 WHIRLPOOL 130803a995fffd8a3e197cb5d5ce9830ea75e33cb7e8fca8353355a28fdadbd54e57407122fbdd1468a1b84f940b8d1f487a10808b5af9f35967b7e590f51649
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sl.tar.gz 7755865 SHA256 b27962eb415e4fecf5f8596fa6f69f4d2fdf3f856dba68cff005204360ed1eec SHA512 2bffbddf445db6f181e4fbf49b33517b38ff3328b871c5469dfea2b938f79bdbc30d48c1ebbee4e7e013d5ff8e5508bf2bb70648980da7860ecac01c3a0c392d WHIRLPOOL f3bd880a0b23d553239bdc13d3eff766f0c190da5e03def1d3ffb2902c3b67493f758b2a518e00a4ab3157b71c1a37b3faa6f5a4a0eff6ec4e0d6eea16d85eee
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sq.tar.gz 6858277 SHA256 1b5113c6e10c7aa28774a99888ccbc82cdefcdfd34cdedc1bc31739798d52f9d SHA512 9bbb91a835fb799d9dde766a361662b502e66dea5a6aad261c34b129cf6d19c1f990ef33f07a26e3af9492b44b888ab23dc0274d7f128b819c55462bfd39fdec WHIRLPOOL b5b0adea781da445407fb2b8c057e4ac2754f6481829593a8b7d5d985c20ee48a2859dc58df39601063caa4672ebe9de9702655221f95913b18ce065d86c4c3a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sv.tar.gz 7691426 SHA256 6f541c145ff40d69760d27b12f28332cbab52ec6ad859d3e80108f35240cc4b1 SHA512 9044860717dd09a75971b3718ddf3514a9d52474b275af551deaa03f5439f93431808470d674a8f86163e69a356825307b7c2f6de67217558c655d5e25e63b6c WHIRLPOOL 9e38b0d635d5148cb608703ffbbfc101b626a6b2ab4c715f0ac5bc3d01b20d7c8061317f8413e562171990e84ede85e80fca54626cd855242869df322477a8ba
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_tg.tar.gz 7192914 SHA256 b73bc9eb28833b8cdde3a39758db9ba6153badff5f1d5aa6d3b8d39e7a8fc242 SHA512 e3807993f33446749d748d4a8cc7837d007948afc3f281b4ad6dd69a36876d6561bc2815e23100fbd3aea90131ceae41eeb9d0efe5d47251954c21c811f56214 WHIRLPOOL 97156b16dba1a20531256726392c0492fa8975a201192c7fa833b5b7977d5f14bcf5aa15708a11e3b37a116c4f0caf91aea7cf255db8d4ea1951c2d440d9ee08
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_tr.tar.gz 7943448 SHA256 d81718f0e77347d79c18ad16d1f3c630a516fbfcb8341ce571fed8690f1f80fb SHA512 bb4b15a32c68c3eefb93533c2e62e972d77fcb82edf1a05395cf1cfd5644a3258cb309412f20a12c4db753846432cf207abd0fd869d0654a3dccd546adb5d48f WHIRLPOOL f6c7200cb9142d924ea530ae55027885a4c474d1ed8a14fab906bc0091213920d8f046b173a60809ff0edf2ed49bcf492a9859a54cf7e52243b927bce3677215
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ug.tar.gz 6847268 SHA256 c85cbe913b4ff7b8400c58999193724268b87fbfb87c9981a84bd2844fd811a1 SHA512 3d868a72178d4a2e92a83ad6cd323b95b65096d18fdcbf0e3827893022f39056b758aa817398533df8485aaf9b28574ec156ebcb59ee3dc018cf8e6ee963f3fb WHIRLPOOL f0d98de00acf5a7ffe04823a5d5fb010df3134b15d4e9e69d60104479b9a0f2e75c64b0a5d5f68b2448cbdc4327c2d1abfa10d244e619b9508dffd00c4f51c5f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_uk.tar.gz 7331044 SHA256 201a2bd98cbc6c97545e8cfd926e278a7da96ea8f3a8de7e4722c77d8bfb852d SHA512 867e9345fcc680ee3a54b5e168c83f4941788fcdee3045e070e1a629d35cb74807fbf81487e764fcd24139b0b0d2e0943d7d2e7a8e8a04309c483960fa8f39e7 WHIRLPOOL a84530193757606c5e876d66f7af9fa83eea77823c49459e52452a37da91553c8ad6843473f86c363de83c61f36fb24086fdbd25efad98b573f6e4922085cf4c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_vi.tar.gz 8158139 SHA256 1249aa08e17c97f70263c7a4e844ede468364ac264a71c06978d547bccf29d9d SHA512 168509fceb2893f0858dd9c67ef1f795647d44b65373d140616946cd233707651690884a9cd3b426e240e6ad75c0237d5c0953b70f092d361650fd3c4fb2df85 WHIRLPOOL 745ccd0ecbbe81f3bb7cf41ac2ec28addaabe13115e62404c7c441dc4b93a11aee7630419fe6a35bb870c7bf176403f9a8760f097066bb86d20d259b5f225751
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz 10718802 SHA256 5293367d3fe21743b55288b70a2290df9c3f435ce2102fca17bf4c575c620666 SHA512 1a819fab976047e5b509e0688bfc2a7278931a919ce4ed306fae7766956821ca00e68696b84790408c717ada39fb11e91cac815f9055854181e33d164b9e06a4 WHIRLPOOL 9be2358731cc1ace99018f5f7c973b3f03f900a05b8384246ae05ebe67a2406b0e971193f77f74a831b412c87701638135493689ee20e9847b5228596c5783af
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz 10762663 SHA256 12d037256cd6919e27c3314c30120db8a3f305b7f78b2b275f46d23b92d2aca3 SHA512 298510fff2e1b3014c45fb138fd2b28c5b1cc6fbae68c8023c64450727f16dbbe75d1129b34abb31c1734641511bf6bb387467aaf097fa3698b4fb7628fdb5f2 WHIRLPOOL 6b89ab7fd16328dafb338d1bee85d16f1bedfd1965086019a849452a805a408d7ef044e118a34de19a4012aae25baa40737d99bf6bcffd59c1bfb723ed1bfe45
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_af.tar.gz 1117018 SHA256 250327ef5b9835e76ff589320a32dbeb439387ac9fcc6be744975992a524a1f8 SHA512 c1857fa5cebbecf5b3308621bac9363c85090efec6245fe02893bd2f7d6a25fb8ddcfc79523a17a48f0c748029163caffeb27c3cb05bc67c2b0c56411651333f WHIRLPOOL 4a26b47702afc174290b8d9b4c7479c3fdfc2dc141a3e231446980b39aa4f9fd80d159a8c9e93bb811a236be92ca6db0adba740444eb0213a5d3ea0ed45d1a0e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_am.tar.gz 522275 SHA256 4b99874d0d74f33704f1cfa50ae120c2cfdc4432085bf26ff86d39c609459d93 SHA512 ab82f6bc029109b0246dc83a349a5aa687cb978a67d0f14ee7817901f2975087a92395eec5f845d91310231045f840ddad425f3ebbc3b97da83afd1c545b4187 WHIRLPOOL 60e12b1540af14162ff16a0a7a0adff4fa23f8d365acaf99ca44c362a02e63ed64eb2624918040ffe4e81a85fa8d4bd4cd8bd5046c252222f1f6514c0cd0d188
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ar.tar.gz 2264863 SHA256 1639ba18df5f23477d74995e01bd5418a3ce54434d336732a5a3a60f65fff054 SHA512 bc797e1228b4c5483689cc2b14b3875548d43f14957b8962a59459a675ac67b43b4dddb1303182e042ac9d87e04b8aa2361779d263e80c56230bc6b83b68e8b1 WHIRLPOOL eb714c680ba3892cc2e20c9618d5d718f2ebb38eabb789b5f16ed20fb37e8f05248c9d00f575ebe3b51a7c1a1db30caada58a6a477e763ecaea80aaf3b6e72fd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_as.tar.gz 549522 SHA256 ecc0c8b32e7edbb22f38ddff95e544cb3d151cdfa28d7a3d5268dfb347b80f32 SHA512 9bad826cb8862e99665c7b4e81185c5089a26be5a327a5a02693a90370f6b1b7f74070b666f1111776ae3b77233552cbea17fab11e4e6da1a8f8989c8d633597 WHIRLPOOL 5e1d2876412c1e53421ddcc794df992e56db7bed4bcda6c46e5f2a7b35803e5a703e8507eb5336f09225a07912b6f7c5b30992824d012f619bcb9e3f5b01456d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ast.tar.gz 505049 SHA256 3ff7c9b920ddf3cf0683ea25ccdade9df75a745da6b36dd7e696c0d07a45dcf2 SHA512 777e8a1abdf7a35b4786debbe52dec40582f179ae8f79845807d193d2c1789df37398f187abb5d58328b24a8ee295f17edab4e7e64609f66c7539f91bc0b71ea WHIRLPOOL e7f23736ef2d192f82a40c8705c4719365309cdec9ae491dc6a7ecdc254c31f3b1a95bd212d744e4f4e0a0c255cf85ea0ea78d15f8010a2fb20bc3208f8be6d3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_be.tar.gz 884790 SHA256 51102958a59a617cea81491554f0924b84719a7f5c1e70343f9ef3ab7033c635 SHA512 a73f31d00c7ec6094d65e72a56f2d1df8c0d9975032e8442a31d07fafb0b3c96a979c46fc5b4f68b3d774484dcf1abceaed943bb0a9302371fdb7b860293a870 WHIRLPOOL 3ed903bd7b3922bebd7ab5e51d088a5036c58d7e0ccb2fd64ec9e04f1497fa55bf7dbea31037868a4f3dbd27cfa93ceb33c2de4b4e565140ce6e6d20d3c9a90b
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bg.tar.gz 1966436 SHA256 c54b8d0261640e21c6d64b979574d460d1815494b501736179a2b0d31e92ce9a SHA512 fc00c5f55055557f8a2693b9a3708daec19490a2f6f5a1dce8e38ab13454257aae2ad30294642a2ded3dd86efa9489cfd8a1e9613a085ba8c142100c750c5d5e WHIRLPOOL 48178df8fd8a2b81d793e755f00ed92e34603ec86a8f27f1280dfaba4342e42070b0cdaf4f88d9395c01755b14313cb1afa1637f64bb39713d2f3c2142e46a65
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz 555922 SHA256 5219e64519b0b9b8c5d749a75457637b1f666c39d859c14ace586dc609a55b32 SHA512 177a54f33cd4cc9f542fe7ac438753a340b79b1d2ecb6923bd654ed879787e9f14dfe21d8ce21850042bf791095543d39f49c5a4e2d6ddb4174863afadcd6ea1 WHIRLPOOL 81eeba991cb0bbe197d363f67777c18166a3ce9a61c6711ee7ea4af947b78a4aad8204bfbb52450cb6ba34e3dfab900406763e31e3eb841cf3d7f8f5ae7adf66
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bn.tar.gz 904077 SHA256 6272c6aabd0cacb6dc5f50c0793fda5b189356f5226fcb6c9905cafe05f3e192 SHA512 a2899332f21f5471bae48324b0931ba228bf4b65cb99f183dfe8f5401db816107f8a165b2470f420c6b525589f08a7d5578007d8794087d8ecafadf927ac6789 WHIRLPOOL 705a5973abb95bf95842d1cb31a235369fa722276f737fc02ffe71b9e716b41cab25a429145a03ed4f24744db211c77b1422c415da5032312cfac36785eb2bd3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bo.tar.gz 538748 SHA256 2f6da3fa0a4cf58a7a4c7ebda060da1fdd3384ca102d8ef56b2cd1b6f9058794 SHA512 e2719807ce6beb5ba897c66297ed84897809cf5c64fb74e0f3870d255b11445892446496102beedfc2c6b816530b998f4b0cefcb7eb6778d16c0f4baeab2e252 WHIRLPOOL b59147ce125fdce8da35a76e5b48610f3d9e614ba54fc836d432921f33b8d35898f11f352c35f0291a8a1bf46b99e2b3cfd1b13ed59a6a3c7d4244a9d6844b51
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_br.tar.gz 1721228 SHA256 8f9eed6faba6a3c3c79a7e8f72ee34a5fed429956097d524b106774d705ce94a SHA512 99d97e48cf9c08860d94fdbf13855672644a815c3c03c68c43626138ddf4c8ccb0b5d7721ccc93ef3edca087d998775a57733824c8886d5619ce9214c6718bb4 WHIRLPOOL 2ae3db6abb3f2aec30074b08b4b47afc4e0092463d6851fcc3cd6a34e9d6d365df6198cd0e6a8a923d40ffc22164ab0ec72e61be125762f2374738ee6c65ade9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_brx.tar.gz 517960 SHA256 558ff01b1fd70350b767375f1ae96cefa273dd0cc819f93edac35ab36a2b5eee SHA512 928ef4b2aaeeacb2533ce8c0ae8238cdf10f931931ac4f192cac4df7c99bae228bd74175b4b6dc2ef0f48a1564cdbc84ce8fe8a942d411ba0584dd90ced05515 WHIRLPOOL ae0fd7ec03bddd1161be2fd6cd699071b417ae6f15cdc78faf5d5b669deb140b3403cee4121557ad1c533fc75631c3e45cf55a987ef7d832bf304db79ee1eea8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bs.tar.gz 619892 SHA256 48322785d163a46e9ba50eff75bf774f2414c39d0ae342eed6c3c1b583635ba1 SHA512 721230fb1e4fb8051ba062dce632857ae8f8e6b8c40952f4cd02e3443122001e8b850d02c9c91472153ad7f8775dd6d4437a1a656f3a89778bee387859fb5ede WHIRLPOOL 13ca8b6b0a814913c6d42230d623865015d338866a8cf4640c69b3bc9079f05a56fe88c39f8608f7f0289426be663469e77a056057442c2e50599e159f400031
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1775162 SHA256 7e91baa9fb10e540728c46ab9dc2bcfb105ca4ebf16a521aeaf4d8049607b3d7 SHA512 c3e87d6ce22d214a94980901b39a951281156d23b729d59eff7c2e2d410dec24db0966c5ed2fd716af834e953b30a46d417a4ba5a5801cd9f86eb809b9c4ac43 WHIRLPOOL b813d3a120153a33d08080958e01a4247e4b846a8b9a0b03f1190b7e562f51e5ed84b057e3b6cca937d8e9e46c82720bc29bf335cf8d7f0474f7b4b8ecd11516
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ca.tar.gz 1776879 SHA256 682fc00eb03acd1ab13e34456196d30e6a7f999d7e3fdbf50f0943ca6bafbfab SHA512 96eabe30a510fc994badd9990a61205d328f9e0b452266948613e21b6a38da12784b0a4fbad2f6128401647611f12b3459399e06b6e89539cd1c602da328cf1f WHIRLPOOL 6f59334676a5bde16d467a9438a8e77004ca04de66d1ff8d4906c4639c00d28190f0f414d2af09b9390b54c3c4c01f169a54025b34e919f48ce0e3cdc1d933aa
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_cs.tar.gz 1238221 SHA256 1439e4f5ddde6ef4c18e2e6d0a7df86a3f513669db6eb7d6484357d9bc55c71a SHA512 888dc3fd0dcc362a6d306be2a6993370fd9278c3a5927e9b28642fd1f570f2e6f8b2ee3b3e63aa56c5065b6d376619221e02cbd4f40f6cb342b1741c21669d67 WHIRLPOOL 892d0d76ca044f5f7afe8f267332f0ab802e7693d47fd44957d4c48594c765730f880af3d69736839042d0ba879b8b80ba38423c5fb4a9841d4ae94b528859b8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_cy.tar.gz 484685 SHA256 e475b0be8175304538e20dc11f8a0969a5165611ae6c59dc7b99a4698120733f SHA512 32c3e001905c8f154c1be8ce57d36fc07dd1093d5c689c4a77ad6ac21626c32f60cd1cb407bdb4a9fb1619414421f15f6c075efbd05f24c3c46f7376ed78d03b WHIRLPOOL f76d987170e6ca88cdce0f2081b755704a4800b64545f60f66eba9f87309f43330c516c7d60b627deb389d85a40afc5821d173e71ee539aa003067f104634a52
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_da.tar.gz 2389294 SHA256 2be1f4659a2c58c50cc64712a25a6bccef061e97709821d51f4772f9dd47eae8 SHA512 95338bc5bcc2b3473910db6a3a28a450d26209f70004d4ba2b25e664b8bc3b8ee21176de1b5f9c8d836e7ff4f8030f39b39dae4745743d3e98d5ea31275ade27 WHIRLPOOL 4c62186ccc25296614ec2653ec391aec8216682ea4c4a1ae1a44ba8b400dead1983704aa069b2518f139835f243a646fa4370164bf7057c5f6714c7621928ea9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_de.tar.gz 18842679 SHA256 3f35eeef160e1290648427a35bfa38bc368d147dcd2ad77d34b7f82ccd3926e3 SHA512 98e05165ad49ea86bd1e92b7bf6e45d0c3b4ed6088e33f0d74cb03241ac59cafa5f8268d40941bd750ea21083fa54e7dac9cccf44bfd9b89b50e8be543335e8d WHIRLPOOL 29a78b4dc0383d993e4fde44f4c1492a3567fae8ec4d6a364d70c896b72ce846fcac88499bbb8c68cafeae332f8d2adb57a97603f7e9018ab9ba9b3cf3d1a356
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_dgo.tar.gz 548837 SHA256 998f84bec4fa93c674dd5beaff559871a418cca2d41e80f54b3397855d060f4c SHA512 fbd2c54b9ce3f4a48dab3a69c7d58c3083966b46efddefc8c779ec23699bddae9b8fcfde17d7ba70254ccd595f22cb5f934ee7fc2762a091ade8f34cfaec0a15 WHIRLPOOL dc7e5f1c22b100693206d4d2dce0bd87b4f6de0eea2d7d5843fa9587543b92214bed661d2b70912e0a0ab7cdfd693324f7922152f68c43fecc1efa480a42a745
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_dz.tar.gz 545051 SHA256 9745d84d8ebdde9244e0b43a4bbdfd48c547366215e5c8ca2484001d39d61ad6 SHA512 ecc4bc78cb2e352d6f56f3d1e20eff36d70cbf65ff073be56c99b426a3f631de3e5dcb9df19d6d5f1414ab1b83a31c80f7744c0e07dea3f729912958ffd8dddc WHIRLPOOL 5f09895b762a5ccec1a0048cd88cc0457498c53ab7aae87f45eae9462d418c1996923df08159d3cc48370866408b4e474be1485592b352d2b19cd2b051b95ecb
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_el.tar.gz 2582571 SHA256 27f111a35f765cfb15cfc44c60fc6c1148986885a32592e589c706b26f709969 SHA512 2bbb331d5248efc47f3fbf1110ec9eb7988fec1ac1249fa2541b29c9651e839b9d46cc947273cfc28177ca0fadc9bd4a1d5cc2d24952268a7e9971237ad384fb WHIRLPOOL 2c17480c69865b8aae8bfdf8d65abd0613989657bf9001798ef8c20820f0d301147d17efa3dc693013aa1555a55f3250f62ad9125dfec2fe00aa2bb747b76c3f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz 7120100 SHA256 8b438c808035aa34883893546b1d6cfa8b8be1e387cff4051acbf697b91ee1b7 SHA512 8edc3313da576122d228a29f41c5b527839dfb0743ff4fe92e437e6410c22eefecc47a3ed0166e585a4ff777d834c509c9e88398c0ffa49524d72c3a4bcc0a37 WHIRLPOOL 9416e40c6c55e5abeb8a01bc9e53fd8ad506c747430ff839db94a4ab5980f26a342a26654e4c3aa8492d97f28493c1377a3ba706c1cd330ae294da66df57b77e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz 7038048 SHA256 a1cf8b209aeb75f8356b38ba019fa19cbfea97a9de199cc7b184f8dfdbe13171 SHA512 ca047084269d03e59241698d424c60356396ce675227fa560c938f8f2200e51193ba05961ce375e7ecff3cd1d46e48306e17e632faa5486a0a994ae5f67b12f6 WHIRLPOOL 39fcfa5fc162510d93d53421913fc9fc3295098a206f9891d427b1503510296e466af28fb9cf59730a86121e448e002de730938d10c312268d3998427a053d7d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_eo.tar.gz 481261 SHA256 37b0f2405eaddb59ea082c10216b4a547ebebe2a3188a340bbbeb77d277159b8 SHA512 36b6ee0329c4c3b6572fb72781ef46a9ecf2e43a3197dd36c620503d105e593a55160acd4f79a10a1f8fefbf514323bdd96a343c75c1e3cc5d632949a784a335 WHIRLPOOL b22e42dcdbaabaf67781e50003e6a17a061227f7d13b61e321710d1271cbd75aed759037013d4d950cd7e1a2cf03547f6d50049208de7c3c7eb3bc9d26024a6a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_es.tar.gz 1963621 SHA256 7d4946682e35f88269fe20800da37143b39b673509b7958a6454db3e8347be1f SHA512 6639117748f07f8bdf8bf6290ebe221af183039e359a94e384b90efd24e9d717dedfc2c144c5d5d4d5c73a75a4c93a428b03ee519fb6cbe7e30f8ed8675d9ce1 WHIRLPOOL bb94b8a8d6637185e150efb9438f9b3745761decba790d43a04152f3a3a16f4ad6f5bac5e3da7cec22d4769daecceb5ca822fbcfd91f97695e347c745b0b8e3a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_et.tar.gz 1390747 SHA256 91697fcd02dafa16634611d24e6f402ffb73f8a1b8d4bcfee39d94a8de1c545b SHA512 fdad04686069b08d0692f7cdbb417e417c3913ed88681235acd70b8c8ea036ec3511b3f23569fbbefeff5a9bd3557e54d681e74b259d0e5a3af44722a0859b5c WHIRLPOOL b142569781ec159a2eb63d1b4baa2cfca2800e51434c261a926485c172f8a63847cc3bdf3010fbea78504b57f96ff3a5af55edd76daeb89c452172c3a4182180
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_eu.tar.gz 491436 SHA256 be1b25e0a3069a53add4166eee2ef948df0341a30f872a62c5b70c771a9e8b32 SHA512 58e856ebdd79b374adae537d7fec74498cdd2594853260ae7ac3ffccc720b527dab3e6d002868a3dbad7868037be823e8fdb51c7cb1c585f7272b4cf48d6d815 WHIRLPOOL 967a4227009e9cd32b760650a19fb83b63d8db00e11a7b4d2910c7854b9b30b22a8e9fac2a6d7af388c9fac7ecada7958a9920723dfd52cdf579a3eea05b84ad
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fa.tar.gz 513695 SHA256 620d9a240cb89e0a9611a235618c5d2023e43bb214ec245bac5bb142f18e829b SHA512 a5ac8b107e89c6f3071fc8774ab3dc629a2914381f2221a65561ab3125a519cfcbf3415e8aa21956bb52f26bbc41352131a9ec1179ead6f69739f65adf6d4b4d WHIRLPOOL 8328f3d56d8bf15c349b3d889757e40a9205300253cad5a58f09c8157ac17aa6ba8ada1d8e42f71c5d9ce8790f015026dc30dcd135a650351ba4106b7a783f93
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fi.tar.gz 497730 SHA256 be1e9228eed275163848ad6cbc6b346a88c6cfdaa0bee321e19d0c782dc8d9f3 SHA512 85dbb6eae0c2edf266d02e6a27d47fcdc7c39252b93bdcd2001b28907e18520b29e57e4b198e34f873880b9bb0e5ed1155c71b511bb47d7c86783fad9c490e4e WHIRLPOOL c9adcc98f96b091a1fb34cea6d9946a3cfef139a0a95af04e9f844aba48547649f62c0fc42ffa042cb9e419ec055f6a7160262ad522474a780bcb6e56a124a45
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fr.tar.gz 2820836 SHA256 865cac85f474b7ad24832b273f86fec11de0c977a33475c7a9d51bac1233c162 SHA512 3804f3c8d789712d6f4305e8bbea91d1a203e1bce0de6c7e6f5521cbee002636c0d46aec15c714a34d125ca623880e1a99de615496938a1f4302d9585fa211bd WHIRLPOOL e9d2a59e07e86fda5b3191081738191dc75207360ec322a7c40e91360001b475e9c200ef0e35b0f01b62728616a47c3e6141cb11de96825b5e5283c1624a8602
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ga.tar.gz 507369 SHA256 ad8937141f7a0bcbc7d6bdf6746ac7f7a21999513c95400c549e80b17398ed1f SHA512 1ef5563ddf55762920b36396d62ff1615587347e25fbea15681f0eaa42bfd758a67d30282b6d1632dfccbc8f097d3ee48e67becbc0ae993945d452f7d3e9f5e3 WHIRLPOOL 75a35cf9160068c9b55e743f1259c13005c0e05410c8e18e4f5fcc01f30692d77a57b6a22a66b293ec36b8cb35504e76aa6f4533b0ab986e5a4b00237b5c730f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gd.tar.gz 1086184 SHA256 d7781200c174ceec80b5844e1a540b57f827445efb94c3b5c0461bf9399aaedf SHA512 f30dff3919f8ce187efc77533a1d32dc0aa5b704fcf7347d9e3bafc6353ffddceb20c04f9bed1eecb15af1711689187669cea105125269013fa4dee4a7b2ee49 WHIRLPOOL 5a6d967ae3d5f1ec5723a421d2bf4f7f0e0ce1aeace478f331ae0eccac7a4d27e8abb2dd5f46e117d0266a989208cb3b501e31c60dd20fa67383017676465110
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gl.tar.gz 1055680 SHA256 a50ec44b4aa46345a13b665b9d5831a3c41fd9586ae75b54ab8b277d6b362ad7 SHA512 ce03762ff08964294b3b558cc9656b12b3c79eb6b4d3de39b594dd270907003eda6a332e52e642206d0c42f8c56de1bd7b5821108f466cb6c0944718a9e5a46c WHIRLPOOL 91751a9cf17c2245c2d560fc833df46590615f03ded6c080d7dff318152c2d7203d5c0180da83c6ab78c129575b502bf6a4bf896f1f7a7942730644c1e6dc5a5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gu.tar.gz 1192578 SHA256 d112a6f5575c8adfd17e76c9f197d4d37314805cf96e371ea902823cabf6b3ef SHA512 d7430d739cd0cf146e86be9bf76cfd746a6b6def951304ae515d3329388cda6d6693462ecf3016e5206543177029f955029eb5a86c4a4223f0144ded6e5b6ae2 WHIRLPOOL c1dd17a5b62d815821ac8be5cd5156f3ca66f1b0b9484143222073a7b6937b2c70ac7296d5807c8268a4b39feb642b518e72791e4b650fe5c9e8973dba33f75d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gug.tar.gz 504184 SHA256 60f8eefd0908362e6b6b6c3f9902feca5216c2bbf638d32bbc2588fbce7e3904 SHA512 2ea2397d64408a2ad85e5306e4fe26b1b69945295df2d8c9ac3868bbb77755e79764710550a3583caf1104eb92180a6996345b670ec2f53236929a1e306b5b1b WHIRLPOOL bd019d26dbcc36dcaa1aca1eefca1048e8b37fa79c6c87eaea1f6294d32c3cc916a1e1b3231c413a912e086173e6699a14a1b006bb3832f6bc72db581e5c5951
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_he.tar.gz 1584688 SHA256 c75af52c8c6913c2cff8b1baae201c8e66d8511b753eaaaf4fdbdecc1648e75a SHA512 6f754026bdc9caf0a7397eb9192103162986f8c55f7f2265272a1fb6d1e2137ac8fc536dfec73535fa8b5189f53310cd93543e99c004e48fb5543cf0cea56f04 WHIRLPOOL 6b206769276e42eae730d83774de86be5a0159ae533a1510d3576e35a1f22a2cd9c468d4f94dc3ca7d607a000ff549d0721c9362ff02f8fd4b49c40488cbaa1d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hi.tar.gz 613961 SHA256 baf0aa1188ec3024af26b0434d10ab51df6699684c262e0b9673a7bfa0890e01 SHA512 cc44c8d1e1559a8f7bfd3743351df61c5a43b200892dbbaab8b12dc5726f0b864187ef5bab6ef5f4a594b3536fa2bfffe70008721533f16445382c9e03cf730a WHIRLPOOL d98cd23edfb7ddbb16ed9921a1e016c681e28b2e38a4121415739368e1b12e2ae14d1b14f1b2ad3f3a05adf1bcacd41d34fd0c769706f004e91da1b08489cf56
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hr.tar.gz 1259223 SHA256 21fcc79815a3ddf4d2924bd7c7703888e8091116f0e736cc35bae1725257132d SHA512 99be5f528de7d9f7080aa5694a19476e32d917266df0381e2de2a24f873c458d9f321c0b4d93caf835be9764f7d57c6677ff40cc5be344deff75ea79e1e98ea8 WHIRLPOOL 08aa3101b5dcb0df4769e962431fdcf21c6ba202693aa67ca143b860ff22cfbc5dc2ee9ac086d5f329af743abc8734130810b92ff9962a4690638baf0e2119b8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hu.tar.gz 2718133 SHA256 b9a170eb9cb313117eca43aee5e96bf7130852e7039d18afacc669fce1a4a081 SHA512 438c6e77bcf2dbab1bdd1f883477386a6159b5fc0512b0b23bec917a77c0ff0451c4144051a03f7f8303a4562a70d82123e9fa4a0ef79acb778d0f865ef4c242 WHIRLPOOL 52752d22b691eabffab28668efd5d3d09cd32a8addc0724e528e1011cf2bf55338dc0ea61f7baf06f80978edc79a3b9b87d41e02b198186d4f3010cabf0f3728
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_id.tar.gz 482984 SHA256 9ec32ed0e6912a50a545335e49f4300188aa7efb2dfbdaf6eb80e31eb66be4f3 SHA512 88c40b4f0b305f92611d5f401450dce423ce8b4c9313431fd49460651cf042f254651bd0bf937bfc6ce5909dab6bdf04c59f575c0931293ea095678e84929f1f WHIRLPOOL cedb6a69389ba0ccfb73398f3f753bf1a591c9bbbb7f31c0e217e9aeb2250a86e4325621c7c9d5294803b99b39b70881b155200105436f285e9c7b8519c8c7f5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_is.tar.gz 1224502 SHA256 f13eff3a0a8ab8115e81171b9c0fee5e7ac7b8450689491d30929e6356f497bf SHA512 ae260f02defb6fecd585e036285039592216e3462bfd9e03863c8ed8be265f0b2a554ff850f7ecccfe69358dcba912e2be3005701b608a929e3145ab31f29151 WHIRLPOOL 71d600cb66bedd5c1d82c8f55150959a62bf37e6610492238411649d2ebcd884e7f03ecb76d6b94220a9674d26899a5e247f5cce4f795d98fb2401bf31f27954
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_it.tar.gz 1828459 SHA256 7f44a3dfd2ac83caf8700e7ccb54eef61de8c64f5038631d555cfbf2705410d4 SHA512 907eab8d2581d667e3a1a2068303cf5583e6a5fd6b438289543ff1d9ac002a5f7a06e685b3387991fb23f07f00a2726ad36b78e16a812f8a403a1cab7e0f9024 WHIRLPOOL 8a692865150fcc4224fd859d97a7dcf71eae6b572c0d0c981748079aa430216ed98bbd0739078455fc933646e46d1fefae14cb519edb4121d9491d894349be7a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ja.tar.gz 592383 SHA256 aa99677eb671801354973ae78a383fcb4779869f809357c3df043d856203073d SHA512 7e5db096a442e2f15bb4b464f1be183727a4c9c2a59c54f6b3e5644fba1ff5d3fc9b5eac2f18be0ded3fe48d6d5ebd0400886fb5ef483662accbf12a68c25d0d WHIRLPOOL c478c74ae2c7cee9abd062128eb5cfb7a19f5cc619a7c97fb8e68569e9b54abd9fa6b30ca474af95539b6d640de584958e3ed83aef657b59f6afd55d43ce24f9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ka.tar.gz 527111 SHA256 05a9b291abd2328402952b6b8fc1e95320a4805c48c53952de33fd2cbf578e7c SHA512 cf51d61af4ef97ec0d53427140a6decec96671ef36e4e2a3159491e43783f66ead5358e83381b27497e815f09d93767252e6721656fd84e683f2510a6a1c3752 WHIRLPOOL 3da5dd62613aea43488e067bc921d79eaa4e76e615d0d1458f368cd401cf2cdce6fd4254c765a50fe877a587cf16d627b1141b06809efdcc35711eee3b06280f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kk.tar.gz 539045 SHA256 be2410ae1701b8a15b0207972c62ab1e1432547265bfa4fc162428e3f1b7a93a SHA512 9e6207093db0d57dbfc01005787571361d68fce1060c47ebef2aadaf4400e1d4ab32d3fc2cce7b1cb73dc24da22b45e9b992be2a2da8aa690141e49fb97c0d28 WHIRLPOOL ac718ad2817a45fb92978a5eb742e12368319391e67a1ab7ee6ead846f81eddbd45ec8e9f87afbb42495df29cd3d231409a9e1f366576ed695629cdbe7dd90c7
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_km.tar.gz 645104 SHA256 4587bf5ce9cc3cdf6edd4f7d1e98bff7c3d7166f8070a6c34488afd0f4026997 SHA512 b3be5c5618bf2f43be00b28eae00a5b8ce3230917557ef8daf590d5cf22f31ab0a5a8d06208de34e09f84682f4ac2fdfa03ceb3d6d79280e22b1dbc3f7e6ae6c WHIRLPOOL fdc16ccbabfab1b1b1d168b670b54b1536e273d5111939e256a3a6105ad421d03a872c9a7831fa9fca2d42f6898db6730a611b4795577f2096a6e38d81ad720d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 500001 SHA256 58d70d0be7e88da8f34b9208f6a42ca119cc49ccac357b57d656248078197e45 SHA512 5d93666d60aa3da0d956f0a77e5cc51a742d1ac418b9ef793cc2a94848e169009b38c5a4deca754cd458204129b9acb594be96048c9544656c0fb52639f92a3c WHIRLPOOL 5655a3edd870d83c9f29bd5290b619f55ec5603d79d7f79d69402c6c865617d57a67cd60eb63ff4085b8b12533747829f4c16b67cff3dc5f94eb6566f3cdd999
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kn.tar.gz 557393 SHA256 b0d2ef7167dca62420f000d68e5e5bb66440fdb1a84121ba4386c6bf82c14693 SHA512 25f98fc252435977b2a0585cc88c0f0957d4c590ef0393975a1910947bec1f38fe409cbe856cd9f37ebc32a97548958fa474337ede49dd013dc85a1c5e945aac WHIRLPOOL ebd6b64da76ba3c28a08cbc68e58bb56ac3cb1f22060b0a06fb0252cdf3a461e8fdee20adc28e0d30d2b681f5a8ee773713fe3e20c7cab1bec42e23356183a2d
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ko.tar.gz 585336 SHA256 cb6fb3a544f969b048e50a68eee73e0d6d4a57ff13f92155b3e2ebdb1c6d847b SHA512 098bf43b3a17daa09ca25a38de0a0f90d51b57fa8add3ba18fef60e92d53f2ad4d9412fb49f75240d1f41ea669cdbf078146e9ee46d0d1ef64d6bd0a2abd3efb WHIRLPOOL dee909edd4bf92f0d29b58a21e7eae438fc984e03fc44c77adaf63bdf78d28918558cf5ea48b1869f15c0a356a4c90422ac5a8eeb965f5a6c21df31fc5d76394
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kok.tar.gz 540985 SHA256 e0daf57163ee436c5c7283566f20a1638e59cea336cface4cc389282d7ea659e SHA512 968eb9a554b6778ac71e53199b49539d419101e9cae52933541a0861b0408cfe58ede4dd01feba7df08c458e7743dd145aaad10eafc42c667a43b3af1a566dad WHIRLPOOL 729fcec50308dfd32d38b04b2d823c0c6ce4c063c3a4891a00f606389fd118b464a1dd59bf87031719686df923ce2b18c7483c90b038878834ef953d5d6b5df4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ks.tar.gz 518903 SHA256 35110b8904b769100c0bb40502918130dfdf566d6079714153a2cd4187ec8348 SHA512 573c0661e67a55db686314948d2337138641bd3d6e1c19c45130150451dd3624cf49ce3d1dd4d92de049f14bec5e77790424f758f23dfb5efd3d6ab9908a905e WHIRLPOOL a887c31ad9ad68caef1dd201404a9f8665946c42d6e3c93d8e187231a907296483c3ba18aaaaae442b1e85c58f6c469ccaed5f7aa45a762c9a8328b1a82817bf
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lb.tar.gz 469552 SHA256 31489844ca1da95d5da39fcb4502d7fe148cbdb8b8f0e64eb1031626c1a9a30d SHA512 51295d72239a9f481bae45ec08f00b5114e978cd734de5458adadba9c704307168f772e06e5446613565aeab3bebfa32203be70ebf4b26d2696e7f59cb9b339b WHIRLPOOL 4d44a6550ebe90b7eb352e3465bd6813a06683bd5fa0cde4801633e0aa5707f8a357b94733b367392715f6ef94a1eb616464def32459159d8e887eef74d0e2a9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lo.tar.gz 563761 SHA256 22d9e33c37a4ba9aed7c35a85ed18788705240ea7c99cbfc9487aec9c07ef6b8 SHA512 10bddd799c16595d1c9634daa6dc5d2673d74ebae9e32976f029bc40c8c9b0c2b87674d1a4772b4700804f48e7b277cb6b7767d6bd1a7c35a3f283ecb183c080 WHIRLPOOL e621bccf62799d4350990eab11397c9733067828d7e6c3e5db1e7c762ffa090a47d00e8ffc008c5e852a99801194cf9388a59e299479c2365c99915c261fb8c6
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lt.tar.gz 838122 SHA256 a2c8bd1eeb2573147e90605708b6899a7920463e8c603fa28252743188bc2e7f SHA512 42c1a15745c036629e93faf19bf84afbaffcb1bc3811ff8e63861ab0e79dd4ac1d98733cd50369af517451f592d50b2fd29328caebddde5164d01ddc15eea8ad WHIRLPOOL e30037ed75ae432d7737b57655539a67ff4dd65449d8d83705ecd1c38b0bcbc73cd568b9d21d494f5e7d01867debf68afa7f36a386f0f051dbca923386d5cd3f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lv.tar.gz 1253902 SHA256 9dda3e517db4eac7018379f959678af9ca3900fa319b47c3b2fb664361235a37 SHA512 2a15c0e6dceb1cc31be4861c7f017d1516c2e1a65bb11552c3432676b6a268fc7e0c84e598e742a13f8dadbcac78d4d5ffd3e0b2c67b6fbd0fcc0ca9ea9237d9 WHIRLPOOL bb6e41672d3f53793499b0a404430304cbb5af24160d39074f0b9fef60953fb902f9a3e2339a6f16247f84d2e9a62f4a91fd7e854faf1c21158fc93202e01f0c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mai.tar.gz 522419 SHA256 9fed724573f9aaadd6f4e98760b319ffc4f6c29a5d652ab3b350f8115c072689 SHA512 edd5e071f743f7720e32861c172865b92ffe4d74285703287759830ed9ad11d2070f81bec31dbcedfb115f3a2353ff627b22214d7c6a4ab1c41f5a15b4d7c39a WHIRLPOOL 6f7c55782b27957ae66f6e8d6152d951f9cf735224eec1456a9582bcd7ccf2c6eeeb499f0ab4bfd6f50b46611b824452a199e7bb2d2e2f813ccc13aa72755b9e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mk.tar.gz 521964 SHA256 1351cc30b42c9007e8a03466a25539b3c8c24cfd7c0549c23d65e8923cf24eb1 SHA512 a9264743a11e8b424b4b0ee40c4629bba6850574a9dcbd359c8eb9b143121ec8954548fc1d6051eba11a62f6cc8747a9bb6cdd58691738fceded04ae5586a0e0 WHIRLPOOL 7c780d97438793a4e71edb55e918f2303188ae9bba8751de500733b664ac26ee97303d8768f9c6d1c215fbdd89f5451cea04c1799a78ac36f4c19648962460df
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ml.tar.gz 563814 SHA256 5fa512b8f65890f75124e6fe3fc63a5d26c69a771b6fd3733aa9fc35d7ed4a61 SHA512 f9ff203bc99ddd72e6e74a11c68bc98a6c31e5af1ad68aa89f7318eb6c24b0b9c9a3f888245c17800ab4f28190ea0bae307f197c78097ce74d95ec52a3dbdbc9 WHIRLPOOL 6b47e3a91f2dd57c4acb7b0faa1b712c28265e892f53a7ca034aaaabb666c5c085a8eae4fe1c9ab5da4ca7c7ead083ce4f29cfee14b9a2843c5fe9f790b1c425
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mn.tar.gz 606882 SHA256 f41e61faec80b822ce89c2da3b75c814eb5796468f355403e5d09c027c9a9102 SHA512 9eea4f333b9ac60e304653866f6a923d127f26537dcfe1c42ac14c8bb7bcb19b05ecbe569c7aab7585801f8e9cc4c6a9145746136024992ce3b3b2c4425f7fee WHIRLPOOL 5e6984ad89c2109054d4b2a9c4c02a7ab6d78c324b0fd39ed865e02cfdb7b1f9dc97af4f04bee29e8da9dea4dd46e4f6d1423a05ce839b27a3e59e7c238025b2
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mni.tar.gz 534938 SHA256 d0aa58ea4c48770709d8e34e84982bea08419f18aeaae64437593a55ac692473 SHA512 21ac19a699d2f1ca91b6fffa756e961a61bbb34aaf40a138bd6cf4cd433bd82490a5dd8a67ecfa525cb3b7a76447fd8032da55346c83aa6408fe614a659cf6c5 WHIRLPOOL e8b2f70b1af1e162bc263c7ff57d478fb91af49338a5f65d76dbd366591f832111092b9d67762d6e8054e3d73b3389686f3a11677356a8c9f5244ab8f7771575
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mr.tar.gz 556989 SHA256 9157b1c2f2fe52fa8ffbd2555bfed540021e056acd1f96bdf66bbbae93e49b1f SHA512 714914257c79d39f118fcca19c45afee5df8750fb508f56cb35e2d0c4eb2c7dfd03b3c87f06fc8757e78fa9efebfe689512b545b85dd346992fac46fc2deaeff WHIRLPOOL 870138e910b7b977618433565a5d395e3e7e3f7fca243fd4067589827aed1307fa0f8cad9bc3802a3dbb0a4ea4fca827b4da005699a7ab46066d4c4ff8eebe05
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_my.tar.gz 555786 SHA256 2e957ab1c5f5fb7f1497b20d014df97bff9d98a00856edac954b8a02f22ec852 SHA512 02cb14b76275dd8cd7c3f3103d605ff7d4d9ea40fdf888749c4e08c268e3ee02cab5e8a8fe8428cc575b72212ee95ecc44dcbc69695957ee77ec59c66454ac38 WHIRLPOOL 256ed0a743715934fc48579f02bca608227a20c801340c20d6cf6844bdaddc8bd0ff35463940454dc3a89acaead6e2207bd723467948f94fb9854cd1fda9fc82
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nb.tar.gz 3488573 SHA256 dc8bbeff74f8188d03b230d87b352cf9f2e78f178c8e1b05fa06b0ef57ba8311 SHA512 2c5c88beefaefb5067f6cf0611e5cde9248d41411a42cdd5cc014d14158e9d9b64b33f0bc2355e4ad8b62869bc7aad80103ab34de4231c4f9a804bdce8358586 WHIRLPOOL 6e7ce0aaec8c6f34f5152a116339540d2d1d39b04e93de9b6bec33a7468e942491855e7e8825562ad0c9740df88d1c303ed252ac1ff54d6108d9b5397fe4765c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ne.tar.gz 923636 SHA256 200b27a078514b7f39ca58b0fb86caf461a4bc4b43a45d013bc4e03840e947ab SHA512 1779da7c463ae1c2b8a80cbcceb192a0c96da462d7a05fd60f91e8d68163466597d738a14f63449342e3323a4767efa619ad61ed6751c5b5fcb162cee68bdc7e WHIRLPOOL e6abe3904bab2d8d24beb2c893e893f7334a95bd8a4b9f0e0ccf9e5121ad7556a86b15f4428884dbc9ef297e8ab2142417f4b5d77241194771ded9b8f67c6c15
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nl.tar.gz 1285845 SHA256 1c9c8f71f7e9bf5f4a66b0a623c0a547534460f0d22deaee6b7a439a2e652bbe SHA512 3664d64fda0122e4f50abea76b4efc89c10c4a33cb4d50606e524709332e2f4b587e358089402a4340a99a15c819ba162557053e35e5d8c5733d27c570a520e4 WHIRLPOOL 705fdd435e44b24eaf3caf4c2b15d32d7db0aea30fe5350d83c2ad98663a08f71740062158e7899ef478b1c159fb12f87795fd6f2bb00324521b55e65a8602da
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nn.tar.gz 3484934 SHA256 d067062a888d861f3811b49694e7c0e2697f2e1195b3e4ac40900b9664e64cdf SHA512 8fd19ce07eee4edcea0728b499f056595f96b99a6634fc8cce148acdf237c5fbd25d09c5b20651623ab961b2546979a9dddfaa698ca8c356b41075fb2d266e02 WHIRLPOOL c285e1105df6645aa110a1ba50a187b5a7e5ae4fe5764015780f64e4a1ffc44e88c2758e8b4e110b1994a63b0aa65d5f09264bece3e3427e3ab4032bda6b939f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nr.tar.gz 498632 SHA256 fc1d8024b8738b37b78abb61eeec7e88d8e7fc45f5537982cae8d603dc49a8f3 SHA512 b26e1a101dd370b4281f9235cb60510ea219926bf1a545694e29a450f9d2c3660b00dac26acb34f517bc63f81f88b7651560a3a7bdb2cc4067729b2819bfb04a WHIRLPOOL 81747b45bbed33e46b5a5925871079db61adeb6d404858894086019698346b3d9ab9b27334571c6fd521602d5f91178b04657546a3097e3e732f64e7a9a10c18
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nso.tar.gz 496000 SHA256 808572cd2a942f4e3171fee46ee64463a21b55624fe3ab2465fb1bc253c1189b SHA512 a6a10a04f648ca12ad627772dec2982727732b15ca559e75b361e7a693e66732a719ca3c98d8a11a4cda30d9407099ed99a77ae03fd47f6ef54a2f3f6e758558 WHIRLPOOL 7233abeafa8e6a327cfb66b17847f832916d9cd2e3abc36d236f80369e80b97826a3af6e66762c04a7879105331bf706e0927bfa8c1c503888523d534db34636
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_oc.tar.gz 697444 SHA256 8eeb552beb8b7a386c43df7f5abffc667baed078b0086877fc7308ec0981696d SHA512 7b3983b5b87674922dea63597065817dd8d7724d42d2b52f1d0f036840eaa898bd6cf9059166d29d8d59e3bd86e5fbf21c6b4c991b3792879a9e5a038a18dc6a WHIRLPOOL 2c8dfd0793d00a94021d091e116b46a79837123a6c163056acb752bc609686b189ff48c4d20cae461a29ae988e94d8dee7b92e95c4732fd102fbcb45cdd93b46
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_om.tar.gz 488530 SHA256 cb4c26c5a2ead9acba459b6cf179e9331d098e1bb028c08196c744effc82ccb6 SHA512 ea2c36a99ae647c270f909fbd40bfd97cc8d76b5dae23a63411cb41a69d893ea9ed40811317348bbfd31cfe10cb51db07295e5ad12e00517d221dbd630479076 WHIRLPOOL 30015c1a1028fe613210662d6ff06e34bde0cf1776c76b3ed8933ab128200a55759a5d275e73839e00ae8711747f35002735c6f27fba7f7b048b984efead4da5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_or.tar.gz 556460 SHA256 11c48de161136cfd9b3525f41f1bcc3225c29372663279d8c0125b43f652f604 SHA512 c5ab8eaff9d85324d684e3dbe8deadabc89c661107d64aa1e81f49ef065d540d678463d1085895f258a9760bca9862002c2b344a9d8e4842d5a6a7317b129d5e WHIRLPOOL 04a0ef9a35123fc55a6c820d323ccc81395c49f0391cbe70908c878dc671a29e1aca7fe815c1060689c85a9526820a82400f33ee3a4e48167e60a8e91c243d5b
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz 527187 SHA256 48b08efc80f68584750c1fe0a81f1e0235bcba06eb32e81c1cf953be6713dedf SHA512 37cc41a79df0d55b065cc017c8ed8344ce3644af36b6523f932c91692403d40de6adcf7384ecd8ac13f2887bc6292aefd26cb855a9114eb1a51058ec8da494b2 WHIRLPOOL 5980336b45ef07896a7eb94cc00a13d1eea674f480c39d4454847d39d16ab0edb22947a6a01e56e2393b47efd449286fb8b3fa2a47c7cab7f55bfc2b40be0122
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pl.tar.gz 3280606 SHA256 c2a93ffda3ae37bca593bc495f722981c041a435db5649dbf31ea994a4cc2dd7 SHA512 c933df5e436e162b4a4c55f2892a81a9955e192757621bd3281813624c83912ed2f6846fe5017f8c5cf89ec0b62291205e220c1dcf7f1668e46e000fe78f10bf WHIRLPOOL 0dda347e92c03540051420fe59ab73b10f68b36436d6cc0ca6a72d38fc6ea71cabffce9ba891d8cfc6590a456943dd5489996c9d698e18517f0c3ff9fbee0ee8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz 2577865 SHA256 990a5bbca5578e82b712dda0373ae39489b1b76ba3e372d65cfc018ed0cc6c96 SHA512 d8d2d20d5904aaa2ea883aa801381c5a8e5a33fc8bf62f9271e3f5722ba3be8876bf595be0432fe3f4a8f5f5f0cdb86f7e5dc64f73572b1c9ba0559ccfe37807 WHIRLPOOL 797e80ac7bca4c08c4517df655bc7d35c4054d54487d7aa886e4ec0da5ced99a8c52cd554594dd7785ddb97df19c4c72b6efa6a50ddbd1323e5457b1372f154b
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pt.tar.gz 1130989 SHA256 9dc5c237db7ce753a3535fa370be60aa77512373a71eeecaffb21c14d2ecc765 SHA512 cf0703a021b3ceb978b032f5a39d92638d8478b805fc0fd7cf2e5bd21d25667712d75ef2d40eb2c2a03fa57fe9bc1499a0e585003559566abfd44d0913737774 WHIRLPOOL 175936bd95769e44f777caa2bc5b48e570c68e0987fa34aa42a4eaf6dc3af1eb1a55e196503a98a48514bd7ad77221699807b091e96d70eca47307b4d061771c
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ro.tar.gz 2365184 SHA256 5f5118cb686a466386dfa0bfdaef96440065464298a0fccf1fc0b965564f451d SHA512 c21615043eabccaf43bd60e2d06718d0ba275fc433f7829ad1468cf2d33dfd3e780520da2e541ad4be075f394dc0ed56f3040caf4de58e989ff9176e929dd1db WHIRLPOOL 5a7f2f8faf369d71bb3da095b93fd8ed00c02ccd1dd0fc2be97d53f81c0861f9af347dcba0aded3939f8cf8783ec61118cae95c64abe17be21d588654afb97d5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ru.tar.gz 1651712 SHA256 4f3a50d285b547cd9f081426664c39719e2911e8bd8f69be123d2527377080ef SHA512 f6e6eff2545b80dc78473847f4fcaa2f19be5f20afdbbeedd21819c3d7ccdef6b3bb91e2baa8124bd546efb3fdfbdc6c24c73e6309814e949f8aced4840c017b WHIRLPOOL 5c0fac60df1c6502cea7cad1a64704a700681c83d342f41ea91d5003f190af76c08ef05dffdf69b75ea70dd676b37216c59bce11bb12b6c0ed52a78008b44278
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_rw.tar.gz 492403 SHA256 49db4db8ee9c3835c1ad96b0eab4466728ee4a6cf2a3a91cedc7dccd07903e82 SHA512 7fc247061617348114133faeb49cf3a1228c7f4b6475af3d96d9c0e33443d2b056fac9fcdd6310fc267b1de367d3b1912f42f571e3398dd97bf1d6a089a079bc WHIRLPOOL 3a8284d5ab19bffc9a2a11eaf4864d854bcd0b683a0e1b45dc248405b0a7221ccccbe1d728c65ef72aac7e28ef01260bfcfd8d5f0917fc9c103ce86676bba784
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz 542495 SHA256 ec0508fb556a88e15c5b31906c9ca6a7f77afa87b5fe420abe9299f3a7be3d5d SHA512 42c8feb2c6006682fbdaf029b38b45fb2df9b5383de7ba0aff3ce46ff6bcc43d48a6e2538a58238a8894873e12b4ad570dfb31660579ad72d942dd88b3e09098 WHIRLPOOL 0defb0585af73804362fa595dea2700d6eb36828744568a2a0aa76ee84fc5f63f0e3ac8fb2af42b17e8683f8a22830d4084172f82d0c2e1b686d14409bd08c27
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sat.tar.gz 583697 SHA256 4f86d558a8f7bb5218a3abc6198fe69b1b1d1d7a6959f0bede95e29a152dd505 SHA512 003521b4e73dad82cc6efe8d445f63dcd970373d94f6ad0252c39457662f4c9f842cf54c8b07b4a11cc43df2256e8073bb77aa25acf81ecfc6ef1bba8c4d60e8 WHIRLPOOL 8220c1198e62f686747804c93edc1afc4953110face3a54edc2c718484619b6dda4ff323d59075d2f62bc4aad89a9fb04ebc89a777a764232a3ac909733a82e0
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sd.tar.gz 534521 SHA256 349a20043fce58fd4fb64e83e32cf7afcd6518d2cf11778d2e601f6cbb4c27df SHA512 328afcd7c55a5ce67231c33d5064e4750cbd67939261218081075ca1ce9f5f67cf1edabbabbecb0075633c232733a71786aac9bd34a6dc95fe5c198856d74cbd WHIRLPOOL e3bced94488cef580e2133188521176831348b4679158f5a9bbf2109e805b3396cad698f7b43f065f84767dae9ade8bb19f38c6f4c726fc3e3cd4b1aea02da7b
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_si.tar.gz 825778 SHA256 6e260a11f59f77aad52b013b8d7992893c72dbe2c170c0b9047af893e45dbfab SHA512 3c722588a24093b8dae85773d0a5a35a4e748b9805b93a31bce36655409ca80bff7f3ee184d2491279dea6e5e2fc9e6e8d7cbe178d16123ac68ced3bd34c8425 WHIRLPOOL 1b431c956d6487d70524f725f853dd2ccf5efeb081cbd236a9fc78ed3343bdd2fc04d71df88fa9c1001408db26199c679ff9878025c010a76d9f26d3b586a329
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sid.tar.gz 495972 SHA256 6d0ca5f5543717631191cc1f387dc5597e4cc7c5f1afa5b44070ecc7d0f39afc SHA512 a76937039b523846ea061dfe16e62f4f407b3db034ba160c43e9a309cb531c921e066a5e1533bc88cacb7fa898aa6da00c49fd2900a1f35234ebdb105b6e0c0c WHIRLPOOL 4fa09128e13de662e59905340f40fc29248fdd2117255ce05dcfd7a87bee49a30e05da6c7a14d59050601a5a631234e083c6dad7733282882711da5b7e9194ff
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sk.tar.gz 1786608 SHA256 10f0da3cc7cfabcc875b80529bcdc9aa71f64c886d6bd6bbcebe21d7fc67f3c8 SHA512 4ca4720dea08529d6b7c7ded7ca3334377c6461e9839f24c993caa424eaf87972b319ba2847547b52752267bf9dd19f3766ea9f51be132fac276c947de27d064 WHIRLPOOL af2db9416ec20677074374544f731183c14d3667b637d89c169c4538942df8eb715c2a55b0ddaf9569d0d621473e64d2b9684bc258fda1719d77bd4df9c5dacd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sl.tar.gz 2163476 SHA256 f73eee35e77c91ee391e0e4b3784617ff40478dff6b218e6232929abd15f4487 SHA512 15ab3ca174dfee73f199442fc6a49ee5624f22df904ca07e6f9d0bb107687de5c05fc54f411b7de2a08c1e1f8e7074c843220c9a0211796e2ce4ac9045d7fc58 WHIRLPOOL b7ecdd6515f57c44e277cad7cf29056984f3798ffcb2dfbb3750ac6994caf34760daa3f575194e5f8b2f3559dc389b919681fb239587d5fd57172d6bf2a98da8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sq.tar.gz 510057 SHA256 6587300237c35f5043791bfc3ca797ee6d26aead20fe24f489279a67ff25f6e3 SHA512 8fee3469e8981763cacc639f74afdd262b172cbbebe4a21ae09cc406c79d62047eaa2be802347aaa3ad20d1c78870133ea51f67b59b7deb48de46f817eb27844 WHIRLPOOL c12a75a61f735c5cedce13dd7476c74df667036bfc89768d31c8ea96a05471088346a7e8915c00bbfb9a23ecd3cfce69fd5164cb864d769c816c7d4f30ef94ff
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1685790 SHA256 ba6b0298443fd84bd4fdf883aff37ee0bc2de9be671eaf0939e1ddbea9015d4a SHA512 4febef561e5e3cda7efbf9c8cfdafbc7824e39deb42c0a8ff6a032d85675f0375c883cc120a9f74f24d166971a63650623bc902b27b5c8f83b7e9f3626ca1f44 WHIRLPOOL 65d0a8e17f1dcd89d7acc322bbf10f93823fe491b17d2fe2122521cdde14b5e8a38bcd397c7f15845151f89bc1cf7c97a4693327b0ce476dafacfba433335c71
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sr.tar.gz 1714742 SHA256 333f34cb116369f9b5bbc364d6aa7d92bef990cbf7524f80e0872aadc7c4c96d SHA512 fe78afac40189af57727d9695a643d75bc232343e630a44ab987ecc12f1c938088ba8319190cb25630de89181d051e52d5861945c409b4eceda5d6d02c608fbc WHIRLPOOL e7fea0ace0a1d8c774b740e448cb45e32f83952b456891ef8976930492f225bb3823e5c32d5a70e4ce674d98fbadeb6b8084b009a18e70fe98d00b10fc462aa4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ss.tar.gz 496055 SHA256 bb8ba8e73f717e810237144df1373d090d76b0c8f3882deb7f3d7114223c3639 SHA512 f4cce1d0988aa79da26955ecc8f04055cd1d99267ffdd056ac344a9e1842424bfba82cfca1ee805859bba8622b522b4d3386fa9bae6f0d90d4bd5542e287d3b8 WHIRLPOOL 391c30314a3bec0d2ce7d939e3cdbcb2b6e6adaafba818cc659be8a43261b6a1eebb8943bd0202538f1a8964c6b244a4faf40665063f7342fb224334ae13eebd
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_st.tar.gz 495382 SHA256 8b805e37462292207f90518eb42b6155b288b96e6f4ec2ad0d7872beed4f4f07 SHA512 f6b4b5d50e862e152f7d54afc27aab00b6f2f5ab46f601aee475f16bf6f24ac1ca38ee97a4e772013f58c2d2f9e8041139851dc94b24bf80176da52b21e01442 WHIRLPOOL 83875a5daee66a9aae009291731db1907b94a1dfc56b64eeccba2ff26b3e3fad615f918a422bad2dc73be24e9fa040e302a8597c33ddb118fd58d3509f9bcca3
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sv.tar.gz 2366289 SHA256 45b60afadd2851b82583f18adf31560f2ece03861beaefd62b137ab7cfb3c3a5 SHA512 a57d3a8ae53585a1f4020ea90f00ca443dfbf8590c5dfe96699e4f81d6d38b4b88ab5b6de8c8189446af9c56ac2485743bdd6f872b6edd56c7475f3e1aa73fae WHIRLPOOL 82db12ac1fdf912697ead4d5b9485ace5342662138550b91810922c39da66e5fd5c0c2ca507b86df3c41d80b3896b0197cdd57cdcaa34751d73af26da2a1e6ab
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz 482428 SHA256 dc47178d0daae35d7618427a4c298c2f788207dfc26062367c39b82415d3bddd SHA512 2983e6813f270097dad3f16a31b06464cacec47ef27854f0352602a4512618bda4da1e7c9f88cb8df05871ef9d70f998ce25b20b7f744d97e484d23dd7ec1abd WHIRLPOOL 019e46cec7c3d589772bf1d2151c4f1f19ed99d96e869d0eed88dfb6d0f6521f1a7d63360cc2cee825f350d2c2df7afe9202d0425e040c12f6e2d7780e3457c8
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ta.tar.gz 550735 SHA256 d53402e1d776e7a52454c11d2380ebd733749558537c795dd779007c0c372935 SHA512 5c1da0402ae1f0e8ea88f56851abf401fcc493dbec928a6f52d3ec81cb1b4bdff073adcb91aa3b25880c5d608f0135e582541b88e64400c78d133dfe0e17138e WHIRLPOOL 6e9c34fbbd0c9e7a6d586dede8f61d88e0e9429d7d7444884873be12911da9f1b237f5f136c364a50d844a24bb45b3f980f1abcecb83f6d4882218a4f469a5be
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_te.tar.gz 1107741 SHA256 0932e3d8f1d3d035da67673e1231b7f0856e9de2429275d3c3f4be6aebcae8fb SHA512 5eb29e06c9ca7862c0eea7f849c3a00baded3adf5b1b644404904f2de1db2d10f23274eebcf0863641e5b4923a81045d7cf4e9da12debaaf90a02ad96995b6a2 WHIRLPOOL 568055a70dbeaa45824ebf765f8bb8ae09c88250e3339d92a44d0114a0b3414dec1e4f2d581cc6c5078aa85539224a04de24a404412cb8962de05400961465a0
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tg.tar.gz 513690 SHA256 3b896ce51490c550f0098602b0a579c3aab01421b156f370b5073482f581aa09 SHA512 0f54396c65d7439bf5cfb55397fdac314f0e37181794e4ea4dab07e60e64eafbaf1cd702f1e05e9dec78082674f8832a6f9fc213060895f15c358c6105b33372 WHIRLPOOL 4e7fc2ffa181882071e5783eb30750f33294582cb8042b05c6a61b43e4e12c2f0dee9a6a34abf0a3954710c31d19fec669253ba54c413c5b71d61687897bccb4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_th.tar.gz 693303 SHA256 2f755aa4c384706673a1a72421bb87f28a7e4c418132cf473f44f594cdc81507 SHA512 034b13f6c17bb73edfd8030663d81f29a730c03afcc7228bad0f0d533a153f86aeaebfe03f34a44c36ed249abd26b010ad89e68eb01067eb6d12de0780731fcd WHIRLPOOL 40de556b3754aef7ee50ddf278923265567d266d40c0e1f05fd8c6bb1a303c2d35a718703ad75977e31ff713c3dc0dddf5ec0f303879632548b1b2b6ce769e4f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tn.tar.gz 487316 SHA256 d110b4b085f7d3fe7673111cb9c98a3f8853caeeb28dc820dd4e7348412e052b SHA512 d1b6d32afecba06226b85b41f965bc59fbc9ad6131543b70b8210cf79a2bf60293e74b7da1db6500f8bf553c50097e9fedf68f9a1e1c86ba82eba28e50fc837f WHIRLPOOL 2f3981408bf6428bf5b3e00a06d8189ec380c67c98fe1a8659b035098869ceebe51bc079b07d855d0042c82e27c858cb002ad74374fbd1b04e801aec4579f30a
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tr.tar.gz 536148 SHA256 c314662c49c054a91f309c12e57672a68f5845a741b9afc581afb4ab7e787966 SHA512 1cb25fd2f78f1a69255474ff9dde9ae9f28a6deab4dc89d2260712d49c1662b7a1a4680af41833e60c89b45cadafd5721501e2fa6f9b66fe77d5b9199cc3c79d WHIRLPOOL 6fef8090708f2b417bf9e96fbb1684af1f1cad624cb26412c27459038266abf925807886543598655212b3410398af1e4f595f3c65055d4d5b7c76c60e449445
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ts.tar.gz 497010 SHA256 76df69714f013a52ead88d3bf762624cca4a041982e994d60709dfaf68517c32 SHA512 11e4688fb654964544c7ac99f388e7183f33b8490f343ebc8932c9294aaeda630317a08f747d13d45128c55fac81e6bcd00464317baa1c88f0e8e9182bfdf3b1 WHIRLPOOL a289de35948807fa73ad47cd8421c4bff55cc5e1371651629a865105bf0a979d006743daeca202352555b62167a164c2e319d030344885087c1bc479b64faa2f
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tt.tar.gz 486956 SHA256 a1ebb8e37eea68fbeb01f346c066c317b45a8274d52970be4d166b4dc3516e7d SHA512 f67b9b1beb3955330bb08d846f2a397a22574119e2f26142568fe902aabbfcc24e50125bdafe2cd05c52830085b0449e94e949bad66fce09bd4c7d5309ad4bc1 WHIRLPOOL d4857aaf64cc8e5850d061c840859243bd5b6885d656599e4451209208fc5c560d43441565bca2c112829813d783abb99a17443cc2234078aa6f0e60982bad81
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ug.tar.gz 526409 SHA256 1159034d1f2385b378ae91fee419225f6f296527002a6aba1389f8dfd8c6a951 SHA512 90485b4f2b90f98e322c4d2d9b4ac25bab9a6ee18747814269ddde1115d209f395498b188421da83743d073a2e1c71d817745715d753511fb4afc4849caeae72 WHIRLPOOL b93c68c4ea0a49dbf144267e53fde5e7c3a6c294bb5214250e9d01010c42c6507a3fb33ae9eeee35cf21d5e49d0c3ccdac43df38c0007835f64a010a1c52f57e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_uk.tar.gz 1375439 SHA256 bffad6b41ada73dfe7237c1b1cabf4e067383193838cce88492ac451f6834e43 SHA512 3cbd9a8db28bac22f12ff77327947241f04406d3a376046a070458f31d85713f696db6723bc20c7fd7e0c2725cb428bdb142f10163b3abb7806d2a21cbc7fb38 WHIRLPOOL b45bcc10ff984e4c216ba8f5485671b65cbd08f8ee9a541b2c3060dd42333c9b3515dac5d19c29ebfdbe4f9283f73a14f93cd265ff04929de7927388e1f222d1
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_uz.tar.gz 487743 SHA256 33e2c14c2cbeec3a7bb9b43fed3ddc19433284e1328b93e7ed3226d1c9435874 SHA512 d9368ce5141e7cb8be68d8747879793750df4970f862f0f61a3f096405c128cfc11f31b462596917d93579b4e8bd540f1b19c6b4bb1b7c4c4fb25bf6d60d8a4e WHIRLPOOL 7ea9d6b0a21ff673f8b7ebb18d6a30f79e47d3f7fc559687e6b1da6d54f459556834a41cd72be8759dec76e02fa0c3d352f804ac7ad6307fbaf7999aa64ebdb5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ve.tar.gz 499443 SHA256 3b0514851f3bc0270fe0333d0c34e5d315a711c0a07b8849099e92cfc1deefc3 SHA512 f26290ef84ed98952a263a27b2674f957c928f790c1a4e3c7e0e8de2c0c8aced59dc970478bbeff5f016bcbba1b6e24e6c6c2eb104ef8e8970722b4626f40fa2 WHIRLPOOL c222edf89dd7b532437cf084cf5944b39c1158fb3297fd61e2ea22b47cc2afac35c0646d46d644b1ff997c96b389805de984f4d66f14dc344e51ffc41c57502e
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_vi.tar.gz 527210 SHA256 78d8a8ba19e9813334ee2b136497a939d55e7a9eb6136ee8f97c8924dd105203 SHA512 743c744b24b7f651db2691083b5154bc60a5ec082fb05f20d2be8cee747f2836a8a78865f015838fbc09d4c27f5dc294b82672f78ed9f0f1e9cdd3f26ca1050c WHIRLPOOL db168dc2a54f303b4d04fc715bac6f291712ecb452a046aec7a803e6164d7cfb25787e68d839ea64ec36654f21180bd8d046a264d051f4a1ff3e622756e1e7e5
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_xh.tar.gz 504507 SHA256 9461e123978d9bcef32724df7b898ef9ba271cfa137fd8ca1a2d0e2d60c59406 SHA512 9e60351b18e2e7bf648d0325e04df1e5fddf6d96ecb52d7bb87b0512e625da973c65872838cd75210b5060a79c1105b618dfe3e5719d10dc39a9ca0aca7a35d9 WHIRLPOOL 3ad45023c381f851b7d20c3afc22383a4055be131ef9a484140e3c2dee07ebf185d3c850583fd1cd658d966ef09fd7e4be8e0d00da415b5228dde15ac17215f9
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 575837 SHA256 80baa0e0c65810d037ec6def3737180e3089602edee768b19ffea45c1e3b1b3f SHA512 90bad9060f3105f770cd79bcf40b54ed59c3d120948572999549e97548c408a3a3b88aaa3f543b0b0b58e83c4dec7e26d20fe712f5bd55d47dc9a5784ae4f96f WHIRLPOOL 7aecfe70f811499f65bc9e79d5880b2af1e05a7b8e1a1ecdb1f5b2f2972b9474a994e30898ef8751ae4cad25656979d16d6713c32a537c52df57777a849021b4
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 574284 SHA256 b13dcb164621479acecfa50dadcadd9df4738b959a11f097eda7589e7a5ec630 SHA512 e02eaae2039e5cc7576b674902cc90e28b488ffb27f84c83a03880cc79b950073e488577f2b45e56b87e737bf7714ce225531a4a542fd51d7feabff1264c2efc WHIRLPOOL b162a2259b92e73f44ad7a3723e75b89dd23cbdd7b550f96fd92719c84c69b05a67eb20cda40e6d7135ce8864bb3dad3b3245c91ae09310b0141c4bb0c04ac42
+DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zu.tar.gz 505667 SHA256 f645c133a2076739388323481bb5ff7bf7a2fa34be9822d92b36c74cefdbe245 SHA512 accb79bf0b890d879966bc5f7c252bd876956ba7851d64e8fdc6546b8ffb5bbf5effa942c8988316d4d61e9d71b555ac7d2ac6c0d9934c638f38ee899efef91f WHIRLPOOL fe56e5a8298610036fb7a57c1736f2b6643328657ec86898fa20017027588848b5ed18d6660363cab6aa27ab3db5588bbf8ee344cdfde5d47d372b04104efd97
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.0.3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.0.3.ebuild
new file mode 100644
index 000000000000..875cd6b0ad72
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.0.3.ebuild
@@ -0,0 +1,91 @@
+# 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 0d52bf308e9c..5364ce9fc54d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,8 +10,10 @@ DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 3f1bd66fedc34d60448f74e864c1cb7
 DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
 DIST libreoffice-5.0.4.2.tar.xz 167305516 SHA256 647440b70fc190a43a3373cfe5b06a87558ee07711e3d74cab8fb9d8cbac6dc8 SHA512 729403edaec752bbb933548e15bf1d417a307e58e0cc6db045bfb97eb99c65b29ae785d207a2611c25b2a55a1fa25e3f0905adbb6500f571fb2f345ccfa53be8 WHIRLPOOL e903d2a218416051002103a7670febca384db8e1e3d6d3e25bbe116629b24534e99d5571ecf4663a8aefe81d3d7211b9f2ec0604fa9c2b861487ed615fc5afc2
 DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
+DIST libreoffice-5.1.0.3.tar.xz 175720564 SHA256 b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 SHA512 ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 WHIRLPOOL 68930103295c2136915c015e0b62388586413fb62bc9c7bf2bb6cea7c7820449438af151c64a9efbd00e205b60e5860ee26a2b288495562a8bab1a33f008d064
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c WHIRLPOOL 2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
 DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
 DIST libreoffice-help-5.0.4.2.tar.xz 1882964 SHA256 5d3c20037a8c2abc04aa3d5991a956538a8dad6669ce0ee0de56d78ebce5b200 SHA512 42c6c8361ec2c8b7d1652110818dcf162ad2508e17f8152713fe4a28439a103346144500a569c9b993ad7edab18637006c8787984756931ab8953868fc97cb44 WHIRLPOOL 238511d7a0ef16c22a774bbcb732da180e8d5d56a3d952a30c0da1cb1cf2154ece7efbe993409a9e6bcae8c2e5ebba049dcf68058a8c151a967f0d6df1dce93b
 DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
+DIST libreoffice-help-5.1.0.3.tar.xz 1903996 SHA256 c2e9dff6a930637ca9b203dc31b7f87b17a03419891201a386e81bfbbdc1b447 SHA512 5a7f9b59d14aa8b3f760abc835f7541d2458b6c2239a42653db91681d82a8f90bfc5c593c74ed086a64de8078eea6367ecd27f0ba07ce37fb13f6dd935f5a438 WHIRLPOOL 6d650f0faf230184a2db7e20440e755b0d05bbda1374bb4fc1bb3ed832d89b4f115bda4fad9f0a280d91d12aec1730b5b9dd76ef1d6acb417a03f7d3f6c4f320
diff --git a/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
new file mode 100644
index 000000000000..e06f81f53dce
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.2-system-pyuno.patch
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index a259bf6..672fa23 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
+     exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
+index 4ff2606..6a05eed 100644
+--- a/pyuno/source/module/uno.py
++++ b/pyuno/source/module/uno.py
+@@ -16,8 +16,12 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++import os
+ import sys
+ 
++sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++    os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
+ import pyuno
+ 
+ try:
+diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
+index 99d3b03..704edab 100755
+--- a/pyuno/source/officehelper.py
++++ b/pyuno/source/officehelper.py
+@@ -44,7 +44,7 @@ def bootstrap():
+         if "UNO_PATH" in os.environ:
+             sOffice = os.environ["UNO_PATH"]
+         else:
+-            sOffice = "" # lets hope for the best
++            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
+         sOffice = os.path.join(sOffice, "soffice")
+         if platform.startswith("win"): 
+             sOffice += ".exe"
diff --git a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
index 863f7c97bb7d..1dad190b5ae1 100644
--- a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
@@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.11.2:=
+	>=dev-util/mdds-0.11.2:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 863f7c97bb7d..1dad190b5ae1 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -220,7 +220,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.11.2:=
+	>=dev-util/mdds-0.11.2:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
index 15d59be51f1f..6b99676cba33 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
index 4cc1a495d37e..1cf15be1f732 100644
--- a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
index 4cc1a495d37e..abeb761c3887 100644
--- a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.5.2.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$
 
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 4cc1a495d37e..abeb761c3887 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.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$
 
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
diff --git a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
new file mode 100644
index 000000000000..bc0732794b6b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
@@ -0,0 +1,588 @@
+# 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{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=""
+# 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]
+	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-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	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=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${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-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
new file mode 100644
index 000000000000..18d7177985f9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -0,0 +1,587 @@
+# 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{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]
+	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-apps/findutils-4.4.2
+	sys-devel/bison
+	sys-apps/coreutils
+	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=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${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 3907338d0b01..9e2bd12efee3 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-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$
 
@@ -59,7 +59,6 @@ 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}/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 )"
@@ -106,15 +105,15 @@ COMMON_DEPEND="
 	app-text/mythes
 	>=app-text/libabw-0.1.0
 	>=app-text/libexttextcat-3.4.4
-	>=app-text/libebook-0.1.1
-	>=app-text/libetonyek-0.1.2
+	>=app-text/libebook-0.1
+	>=app-text/libetonyek-0.1
 	app-text/liblangtag
 	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.6
+	>=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.2
+	>=app-text/libwps-0.4
 	>=app-text/poppler-0.16:=[cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	=dev-cpp/libcmis-0.5*
@@ -158,10 +157,12 @@ COMMON_DEPEND="
 	collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
 	cups? ( net-print/cups )
 	dbus? ( >=dev-libs/dbus-glib-0.92 )
-	eds? ( gnome-extra/evolution-data-server )
+	eds? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
 	firebird? ( >=dev-db/firebird-2.5 )
 	gltf? ( media-libs/libgltf )
-	gnome? ( dev-libs/glib:2 )
 	gtk? (
 		x11-libs/gdk-pixbuf[X]
 		>=x11-libs/gtk+-2.24:2
@@ -215,9 +216,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.12.0:=
+	dev-util/mdds:1=
 	media-libs/glm
-	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
 	sys-devel/bison
 	sys-apps/coreutils
@@ -247,7 +247,7 @@ REQUIRED_USE="
 	collada? ( gltf )
 	eds? ( gnome )
 	gnome? ( gtk )
-	telepathy? ( gnome )
+	telepathy? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -256,7 +256,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# not upstreamable stuff
-	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
 )
 
 CHECKREQS_MEMORY="512M"
@@ -365,7 +365,6 @@ src_prepare() {
 
 src_configure() {
 	local java_opts
-	local internal_libs
 	local lo_ext
 	local ext_opts
 
@@ -380,16 +379,6 @@ src_configure() {
 		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
@@ -427,6 +416,8 @@ src_configure() {
 	# --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
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
 		--with-system-headers \
@@ -440,7 +431,6 @@ src_configure() {
 		--enable-neon \
 		--enable-python=system \
 		--enable-randr \
-		--enable-randr-link \
 		--enable-release-build \
 		--disable-hardlink-deliver \
 		--disable-ccache \
@@ -469,6 +459,7 @@ src_configure() {
 		--without-help \
 		--with-helppack-integration \
 		--without-sun-templates \
+		--without-system-sane \
 		$(use_enable bluetooth sdremote-bluetooth) \
 		$(use_enable coinmp) \
 		$(use_enable collada) \
@@ -494,7 +485,6 @@ src_configure() {
 		$(use_with java) \
 		$(use_with mysql system-mysql-cppconn) \
 		$(use_with odk doxygen) \
-		${internal_libs} \
 		${java_opts} \
 		${ext_opts}
 }
diff --git a/app-office/openerp/metadata.xml b/app-office/openerp/metadata.xml
index 4012873307cc..82bc112c6d79 100644
--- a/app-office/openerp/metadata.xml
+++ b/app-office/openerp/metadata.xml
@@ -1,10 +1,6 @@
 <?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>
 	<maintainer type="person">
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
diff --git a/app-office/pinpoint/pinpoint-0.1.8.ebuild b/app-office/pinpoint/pinpoint-0.1.8.ebuild
index bb1445508d12..eb203e508a61 100644
--- a/app-office/pinpoint/pinpoint-0.1.8.ebuild
+++ b/app-office/pinpoint/pinpoint-0.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+gstreamer +pdf"
 
 # rsvg is used for svg-in-pdf -- clubbing it under pdf for now
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 34710ee32896..f98ad53723f3 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,2 +1,3 @@
 DIST OOoFBTools-2.38.zip 4833754 SHA256 ee039cf7ae2767916cc79b25d5b852a54089773db458aa695b064e3d803da757 SHA512 2ff6bb251b5913cb7ceb430aba6ee47a5b2e2c7b78be8b291d67410903d3679ef8e01554f504cd86993fb717173d2a9c4080b5059f3e1064be075e67766c07d5 WHIRLPOOL 52fcd3bc82eab952080c6e1b18ed12b1568e4dd7299b55b2433efc8f5420f304ae32bbc3a9fe191c9a614f42aa5e04da976758cf9262e94adc238b887d6ecb9e
 DIST OOoFBTools-2.39.zip 4835702 SHA256 cff2a0ab17e4c77a7f3411007a5adf43144088e576f06ac49910419b2ca8e3c0 SHA512 95e66ba9f788902fa54e1c11d867c5e71b0280442fd5f1b75d1b524f24cf34fa2a270b68ebe30676fe5c4edb02033c7de59810ee96d4682bf68d231e8b277117 WHIRLPOOL 14d44d11806b3c717f1fa4e8d2d7fd319cd0fdbe2c2f5cbffdfbe5ef4fbe73e6fdea903a9e4428b3f02ef7b56d9f7b218ab830aecc5ae0f15a18b6898c0cec6c
+DIST OOoFBTools-2.42.zip 4837516 SHA256 c31a73a862734395a4c6ad45e3ff5aa36d0ec5acfd26d6d3e1c27de4ce7c24fc SHA512 a6945dd003c1b6a5be77c224e47d7b30b54ce28ea4a1aeada71ed401a0a6e9afacc08394da908d1f2765e8f4766e55479ed51a98067829bde950732ab27df302 WHIRLPOOL 5f9744331dd0d269b3ac1b6cce29316b7623fe719bd2d685ca75d2a021930d1fdd6c2b657597b69ead86814372da3f74ff342a19f2d0803e2af3acce93c9f872
diff --git a/app-officeext/ooofbtools/ooofbtools-2.42.ebuild b/app-officeext/ooofbtools/ooofbtools-2.42.ebuild
new file mode 100644
index 000000000000..c76b234fb329
--- /dev/null
+++ b/app-officeext/ooofbtools/ooofbtools-2.42.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="OOoFBTools"
+
+OFFICE_EXTENSIONS=(
+	"${MY_PN}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
+HOMEPAGE="https://sourceforge.net/projects/fbtools/"
+SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/libxml2"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+OFFICE_EXTENSIONS_LOCATION="${S}"
+
+src_prepare() {
+	# Remove Windows cruft
+	pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null || die
+	rm -r win32 || die
+	popd 2>/dev/null || die
+}
+
+src_install() {
+	office-ext-r1_src_install
+	dodoc ChangeLog*
+}
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
index cc21a73933a2..78dd0a62661c 100644
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.awk
+++ b/app-portage/eclass-manpages/files/eclass-to-manpage.awk
@@ -379,9 +379,9 @@ function handle_footer() {
 #
 BEGIN {
 	state = "header"
-	if (PORTDIR == "")
-		PORTDIR = "/usr/portage"
-	eclassdir = PORTDIR "/eclass"
+	if (ECLASSDIR == "")
+		ECLASSDIR = "/usr/portage/eclass"
+	eclassdir = ECLASSDIR
 	reporting_bugs = "Please report bugs via http://bugs.gentoo.org/"
 	vcs_url = "https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@"
 }
diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.sh b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
index d41de426debd..7706afa7ae67 100644
--- a/app-portage/eclass-manpages/files/eclass-to-manpage.sh
+++ b/app-portage/eclass-manpages/files/eclass-to-manpage.sh
@@ -26,6 +26,7 @@ ret=0
 for e in "$@" ; do
 	set -- \
 	${AWK} \
+		-vECLASSDIR="${ECLASSDIR}" \
 		-vPORTDIR="${PORTDIR}" \
 		-f "${FILESDIR}"/eclass-to-manpage.awk \
 		${e}
diff --git a/app-portage/eclass-manpages/metadata.xml b/app-portage/eclass-manpages/metadata.xml
index 40f2050c6fc0..5b81642e9ecb 100644
--- a/app-portage/eclass-manpages/metadata.xml
+++ b/app-portage/eclass-manpages/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="person">
 		<email>vapier@gentoo.org</email>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>tools-portage@gentoo.org</email>
 		<name>Gentoo Portage tools team</name>
 	</maintainer>
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index bb8a945d0763..1cf13f987eb6 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,2 +1,3 @@
 DIST grs-0.3.tar.gz 34173 SHA256 445af2f267df936b4a06fdcb17e2a28dafd6eed8d52a8ff69ada622cedd8699d SHA512 710ea986ab55eabed5b774e850854ee36e600d378dd17a2d62cce67132695ecadea01b15ffaed750bb33a6f31e49989952425b7602808f65574ac506da1773fa WHIRLPOOL f5632d5562d6cb66b8111c35c5d5b57e0710d01d679d9c802182d18e2ddee0af7fe058a1275ca45c097fefdb1419943c638fdfe93110639cf299fd1c0df5b83d
 DIST grs-0.4.tar.gz 34212 SHA256 a069b51258fa9dbe8158ebe7339967c588360037a405bb9600ca69f3f18bb0d2 SHA512 e24879aabf7d9d029f584693dcb5e6578d5e14ab9e2588143883b7a27174184a2e2c30d08bf140a1bb45b7ab80c10e73f5ccf96de0bea8185d326ce0ce83fa11 WHIRLPOOL 4a6389efeec00a71f457a5d1087758ebd590aa4546a1c36e37de33a0aae34c7e42cd591795ad3b4a232c5e85511f4d42173fdcb6dbbc7fbb55a89490632e0f30
+DIST grs-0.5.tar.gz 34213 SHA256 8442d68d680665fcf3700add714503929d04cd435ebd487529a2555518bc8825 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f WHIRLPOOL e99c2278a71f8285028699c7e961f27f94bf52189a2de3ea38d07514101fdc45be4b6261c5ea35429afd5acf9e06c4bd7a910df72c82b877e7d324cdb27c7d47
diff --git a/app-portage/grs/grs-0.5.ebuild b/app-portage/grs/grs-0.5.ebuild
new file mode 100644
index 000000000000..901f63a735d6
--- /dev/null
+++ b/app-portage/grs/grs-0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit linux-info
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
+	inherit git-2
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Suite to build Gentoo Reference Systems"
+HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-arch/tar[xattr]
+	app-crypt/md5deep
+	dev-libs/libcgroup
+	dev-vcs/git
+	net-misc/rsync
+	sys-apps/portage
+	sys-fs/squashfs-tools
+	virtual/cdrtools
+	|| (
+		sys-kernel/genkernel
+		sys-kernel/genkernel-next
+	)"
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
+	linux-info_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
+	doenvd "${T}"/20grs
+}
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 7eb8426470ad..901f63a735d6 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,9 +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"
 
+inherit linux-info
+
 PYTHON_COMPAT=( python3_4 )
 
 inherit distutils-r1
@@ -38,6 +40,12 @@ RDEPEND="
 		sys-kernel/genkernel-next
 	)"
 
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS"
+	local ERROR_CGROUPS="WARNING: grsrun requires CONFIG_CGROUPS enabled in the kernel."
+	linux-info_pkg_setup
+}
+
 src_install() {
 	distutils-r1_src_install
 	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 59601888da74..44c61e61d4c5 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,2 +1,3 @@
 DIST metagen-0.6.2.tar.gz 6100 SHA256 d1f6c7a24fa9f7f119c9309ed2ec217bc0fd3da48568417a46220a40e2c74201 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff WHIRLPOOL fa6b85934e58cc5b73237fb619d64bd87df148b8f70fa5df2bbf94ef986f1ea3e693b7e3eb25b56cbe26fe35fff5102ba5787a22ec94800d3d328ccc9606473c
 DIST metagen-0.6.3.tar.bz2 6118 SHA256 655253786c3dafe2426a61d8585acfbbd4a560e0a2609331e230c72699b10494 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd WHIRLPOOL 5e0c594ad728b6646a324d7c8115ad19f15304baad1922fb45e96a771355092e43ba3ae98f0f44e87f2c8e9d74af5ee75c09e86472329e1497dd81959467f927
+DIST metagen-0.6.4.2.tar.bz2 6837 SHA256 b048deace35579b7cc2d7c6eb39aa869369e932220c2a3d3d01ca378b4baa18c SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c WHIRLPOOL 6d5d99a75300858f8ddf947c698109f98355a34db805395bad4211212ef11ce40455ab45174d3adc8faafe18374ac71fe6ff8c43f6db94c75c0ec353df6e44ac
diff --git a/app-portage/metagen/metagen-0.6.4.2.ebuild b/app-portage/metagen/metagen-0.6.4.2.ebuild
new file mode 100644
index 000000000000..a799b6a289c8
--- /dev/null
+++ b/app-portage/metagen/metagen-0.6.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 12cb639bb987..142629cd68c6 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,4 @@
 DIST portage-utils-0.56.tar.xz 513832 SHA256 4df7323fb2667dd9bcee0f2d169c01ed8600aa6196118e6cd3a10cfe99852bbf SHA512 f2136a7df4cd91499b135fbf000f81a71177d5a39b4da2db484ab0f9492d152eaa72a5fee0e56d4b58611462e251905e554f5e41890a749f05d19e50c16c77b6 WHIRLPOOL af0a96ca3bf2dd39335317829aa8aff110a63042c415368400977e974cc21163da7eb76f7d53fcd05e133fd8a8568255ba022a32f1b174bda0dcb15b5f1476b9
 DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d
 DIST portage-utils-0.61.tar.xz 526588 SHA256 9c8942529dcfd9ee5798ab6a61fd0e8d1cc42645cbf4aeeefdb2d18a13076787 SHA512 0d09901f9d0213ef4d3d1b8961185d5f748d46a06663312f382f33e39fd9d94adc97660a11f482f3c9eb771e0f4e6bfc877390e002e7c0455c9e5ad8ebf1a7a2 WHIRLPOOL 0dcce5a46bd53b39c49edecdc35b64d79d83f06a136d773808270d685895e6bcb0669ce2689c39eeccb3f3f97cb7723b58317c34865aa80605af8b88f1d44280
+DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
new file mode 100644
index 000000000000..205874bdf8b9
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.62.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="small and fast portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+RDEPEND="dev-libs/iniparser:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	static? ( dev-libs/iniparser:0[static-libs] )"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux || \
+	   has_version '<sys-libs/glibc-2.10'
+	then
+		econf --with-eprefix="${EPREFIX}"
+	else
+		tc-export CC
+	fi
+}
+
+src_compile() {
+	emake NLS=$(usex nls)
+}
+
+src_install() {
+	default
+
+	exeinto /etc/portage/bin
+	doexe "${FILESDIR}"/post_sync
+	insinto /etc/portage/postsync.d
+	doins "${FILESDIR}"/q-reinitialize
+
+	# Portage fixes shebangs, we just need to fix the paths in the files
+	sed -i \
+		-e "s:\(/etc/portage/postsync.d\|/usr/bin/q\):${EPREFIX}&:g" \
+		"${ED}"/etc/portage/bin/post_sync \
+		"${ED}"/etc/portage/postsync.d/q-reinitialize || die
+}
+
+pkg_preinst() {
+	# preserve +x bit on postsync files #301721
+	local x
+	pushd "${ED}" >/dev/null
+	for x in etc/portage/postsync.d/* ; do
+		[[ -x ${EROOT}/${x} ]] && chmod +x "${x}"
+	done
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "${EPREFIX}/etc/portage/postsync.d/q-reinitialize has been installed for convenience"
+		elog "If you wish for it to be automatically run at the end of every --sync:"
+		elog "   # chmod +x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
+		elog "Normally this should only take a few seconds to run but file systems"
+		elog "such as ext3 can take a lot longer.  To disable, simply do:"
+		elog "   # chmod -x ${EPREFIX}/etc/portage/postsync.d/q-reinitialize"
+	fi
+}
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 27bb9c033b73..6f56d1b133e1 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1 +1 @@
-DIST blogc-0.7.4.tar.xz 265400 SHA256 4798f4a8eeed0f9f6644eb72dfd395423a18e7e83a99465bb3551b03d5b2b74a SHA512 426715507fdb5abd4f1a6a94221c507636b63a6ab1a9b5b1f8437f88137003685a8660dad9177c93d38cced1fed00b1f9cf902e9e5f5b034d27e78005a576273 WHIRLPOOL e030333710fac1485ad0ef24053cd6470e100cdf476f7e2f839f2c69e342f1e70e4c1fd7d9cd75286596d8bfca154a4b705e1ead1a5f95dad32c82bea4cf3cec
+DIST blogc-0.7.5.tar.xz 265468 SHA256 22b66fd38c70ec094bc77bd7a04a0ce2bc1bb2177d3d8cb705baf4ec79283d69 SHA512 75ad54c65fff927117a9135bf606357e52eb91d2c448bf8cac2676e519ab58f919447057e031ebfa90cb033728fa49f5bafb8c94678fe142e1856082870690fb WHIRLPOOL 92f4aec3864e80d57e17ed8b2bef6bdb3e7f12c8f32fc0c42bfb653ce2fcbaf3ee6ab5aebaf9aece79cbb75515d07d28068f83f98cf847c54fd68e7ef6668a7f
diff --git a/app-text/blogc/blogc-0.7.4.ebuild b/app-text/blogc/blogc-0.7.5.ebuild
similarity index 100%
rename from app-text/blogc/blogc-0.7.4.ebuild
rename to app-text/blogc/blogc-0.7.5.ebuild
diff --git a/app-text/evince/evince-3.18.2.ebuild b/app-text/evince/evince-3.18.2.ebuild
index 4d2c68d55389..ba71b19c255f 100644
--- a/app-text/evince/evince-3.18.2.ebuild
+++ b/app-text/evince/evince-3.18.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
 
 # Since 2.26.2, can handle poppler without cairo support. Make it optional ?
 # not mature enough
diff --git a/app-text/gspell/gspell-0.1.2.ebuild b/app-text/gspell/gspell-0.1.2.ebuild
index b2ccffcc875f..64742fbd1d90 100644
--- a/app-text/gspell/gspell-0.1.2.ebuild
+++ b/app-text/gspell/gspell-0.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection vala"
 REQUIRED_IUSE="vala? ( introspection )"
 
diff --git a/app-text/gtkspell/gtkspell-3.0.7.ebuild b/app-text/gtkspell/gtkspell-3.0.7.ebuild
index c4cb2b2b396a..2529821d065e 100644
--- a/app-text/gtkspell/gtkspell-3.0.7.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 
 RDEPEND="
diff --git a/app-text/iso-codes/iso-codes-3.65.ebuild b/app-text/iso-codes/iso-codes-3.65.ebuild
index d5169d2e9133..22f4a6b83881 100644
--- a/app-text/iso-codes/iso-codes-3.65.ebuild
+++ b/app-text/iso-codes/iso-codes-3.65.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 82a3a0376bbb..63ee587ef698 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -2,3 +2,4 @@ DIST libetonyek-0.0.3.tar.xz 341276 SHA256 b5b96cd0857fc9a740d6ec737d613d95e9524
 DIST libetonyek-0.1.1.tar.xz 338396 SHA256 9c6a5a0f15ae6cc6e2dfb2272b664dedda7918ed46f3756f9f29a72589d8c83e SHA512 a75463b1bf41eca19b3d1e9391683a42d2343b23b6bd1d69aa41c10ae0cef4d5794896976ba46ff364e7ead52c556e349c525bb12cea40242542037d60c2a2c4 WHIRLPOOL 373ae59f8cf1f88b37ab7c21ae22e9a6f5d32d23c5dc3b517e101d56c745940ecfc7ba579cd83601390895189271fa9ecc846460c8d570616a5274a634f91dac
 DIST libetonyek-0.1.2.tar.xz 346248 SHA256 58d078a76c3fd839c282244a1a7dabca81cef64be086a5c7d8470bb64208da39 SHA512 9d1ca586c313f93b31a19a47e9a050bbc5be8cac385d16f3060353b26de86ddb35a2d72694ec6d0ad043a108a7fe5d451dcd205db96822a0c0ce32a101b20e80 WHIRLPOOL aaba195fa0f7811a8ef05e64720cb37ca6a06534bcb7f6f0d75a9d35d3ca6fedc27783eb5e13607273e219c70bd4439561081702e80dc549c646a01dd58a595c
 DIST libetonyek-0.1.3.tar.xz 372884 SHA256 fe12276a62bd5f5ca4f5bfbd4938a74d097084e1f9fe173e521f63203f56f055 SHA512 912cb94e6cd63a162a8831368f953c4e6fb14b582a13a7ce93c0bcbb63b688fcbe4733dbb883d6a9faee2011ca5e888d00adda075c2a58d00858770ed68d6844 WHIRLPOOL 5fe864e37f6611c8cda92243a13e08e38ce1fd6f9544ddee7d3392fa9bfe573cd9af6ddd0ff03c7a0cee19b63c46b96398d985eaeb7367cd06aac8796d3655b8
+DIST libetonyek-0.1.6.tar.xz 1243364 SHA256 df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078 SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e WHIRLPOOL 932704f1d8bb1269e6be8e3fd7bd64af01ba0f098272befc747da9a4bd225bb201542bebf31d6e6338e613835fca4d7c6e2c1454df4ed764af30459393b6d73b
diff --git a/app-text/libetonyek/libetonyek-0.1.3.ebuild b/app-text/libetonyek/libetonyek-0.1.3.ebuild
index b28954866d73..295a5d8ed2c2 100644
--- a/app-text/libetonyek/libetonyek-0.1.3.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.3.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$
 
@@ -25,7 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.46
-	>=dev-util/mdds-0.12.1
+	>=dev-util/mdds-0.12.1:0
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -33,6 +33,15 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || {
+		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
+	then
+		eerror "Compilation with gcc older than 4.8 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
 src_prepare() {
 	[[ -d m4 ]] || mkdir "m4"
 	base_src_prepare
diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild
new file mode 100644
index 000000000000..71de2347d2ef
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-util/mdds:1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || {
+		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
+	then
+		eerror "Compilation with gcc older than 4.8 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
+src_prepare() {
+	eapply_user
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable static-libs static) \
+		--disable-werror \
+		$(use_enable test tests) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 649d81202695..71de2347d2ef 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-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
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
@@ -19,13 +19,14 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
+	app-text/liblangtag
 	dev-libs/librevenge
 	dev-libs/libxml2
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
-	>=dev-util/mdds-0.12.1
+	dev-libs/boost
+	dev-util/mdds:1
 	media-libs/glm
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -33,9 +34,18 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || {
+		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
+	then
+		eerror "Compilation with gcc older than 4.8 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
 src_prepare() {
+	eapply_user
 	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml
index 9d67a9d55246..13ce236ee519 100644
--- a/app-text/libetonyek/metadata.xml
+++ b/app-text/libetonyek/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>office@gentoo.org</email>
-	<name>Gentoo Office project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index 3843ee5114af..61c249411796 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,3 +1,4 @@
 DIST libodfgen-0.0.4.tar.xz 296224 SHA256 8f7a46f05417afbe957d0c3f88e375631b8651ea99bb2c231595408bc4224099 SHA512 5d637139c30ce24e11f4ae102b3374c95afb66e6300ef6f45dd4c2957b36bc3c56da53d49b2b6c8ba9bbadc118dffeab11421b85a9ba47e1ccf101bc1cd75e1d WHIRLPOOL 3382383a1a6edbdc183fe649812ee0285294845fdc5c47a8329cadf2fe0374f20189a9e6db0fc166d096c85400466ed56dcc1709e6728fe6b0e1e5b4c3f8c468
 DIST libodfgen-0.1.3.tar.xz 334744 SHA256 d3a09d987e9c0955846cad1e8a885a9c7a76bfaff75d4c1b5626844c62808eba SHA512 c93abc1ce100c38876b70c1458515086f93b1c376df905fd05d428f69e3f7c709a26c38b18583f878a7f2850b069b99917aeb44426d6decb3be3081bec039c86 WHIRLPOOL 74d17ed0320807cf4ddbd92452a59205b0195694c26692fda8c201964df3f56a38c27b65b9bcdaee58469bbf1e91c4a901903de9bb9e6c6050854678f611d2e7
 DIST libodfgen-0.1.4.tar.xz 356480 SHA256 249b5ed8e1acc0fee32b4381b31b4ad9453b674d4f13886bda5e9dd2b4a5f1e1 SHA512 b9229a6aea7dab1de2315a3632a3494bb785fafa8035e8f323176e76553f05cef8fc7b3e0b5fe6c154b4d8bd7ef69526703c580629dcac63adfd552539fcad69 WHIRLPOOL de779e605c2f15b95108df405a860a9285d756c374681df416c26dcd77f5b893c07a3e89ae6d2a62275b518c921f8a4930ff29886607aada8d6bcf0d055c9462
+DIST libodfgen-0.1.6.tar.xz 359988 SHA256 03b210ab44f05e38091508cdca6ba0ff73de3ea8a168f849b8f1c5059c20b9e9 SHA512 bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5 WHIRLPOOL 2c71505c0189a59bb893c7edfd8e4050c7a60f6193e2a77ed63090d8f80618332b0f0c2020d1fc1f319b5635386381b6fea6d3d5117678d9c425d7661a70ddf1
diff --git a/app-text/libodfgen/libodfgen-0.1.6.ebuild b/app-text/libodfgen/libodfgen-0.1.6.ebuild
new file mode 100644
index 000000000000..80975a99492f
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sf.net"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=boost \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index d9557712f6c2..80975a99492f 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
 inherit eutils
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
index 57ceb2778a80..3fed4e155fde 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/1.2.22
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
index 3d86e6edefba..dbc535b5a348 100644
--- a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-cpp/atkmm/atkmm-2.24.2.ebuild b/dev-cpp/atkmm/atkmm-2.24.2.ebuild
index 56fc5dc1c67f..5b0311da2590 100644
--- a/dev-cpp/atkmm/atkmm-2.24.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.24.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
index cc7d1f01fb32..eeb2476e7d83 100644
--- a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://cairographics.org/cairomm"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="aqua doc +svg X"
 
 RDEPEND="
diff --git a/dev-cpp/eigen/eigen-3.2.7.ebuild b/dev-cpp/eigen/eigen-3.2.7.ebuild
index be503c9b36e3..f0cc3dd00abc 100644
--- a/dev-cpp/eigen/eigen-3.2.7.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.7.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils
+FORTRAN_NEEDED="test"
+
+inherit cmake-utils fortran-2
 
 DESCRIPTION="C++ template library for linear algebra"
 HOMEPAGE="http://eigen.tuxfamily.org/"
@@ -13,10 +15,43 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 LICENSE="LGPL-2 GPL-3"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc"
+IUSE="altivec debug doc openmp test"
+IUSE+=" cpu_flags_x86_sse2"
+IUSE+=" cpu_flags_x86_sse3"
+IUSE+=" cpu_flags_x86_sse4_1"
+IUSE+=" cpu_flags_x86_sse4_2"
+IUSE+=" cpu_flags_x86_ssse3"
+#IUSE+=" cpu_flags_x86_x87"
 
-DEPEND="doc? ( app-doc/doxygen[dot,latex] )"
 RDEPEND="!dev-cpp/eigen:0"
+DEPEND="
+	doc? ( app-doc/doxygen[dot,latex] )
+	test? (
+		dev-libs/gmp:0
+		dev-libs/mpfr:0
+		media-libs/freeglut
+		media-libs/glew
+		sci-libs/adolc
+		sci-libs/cholmod
+		sci-libs/fftw:3.0
+		sci-libs/pastix
+		sci-libs/umfpack
+		sci-libs/scotch
+		sci-libs/spqr
+		sci-libs/superlu
+		dev-qt/qtcore:4
+		virtual/opengl
+		virtual/pkgconfig
+	)
+	"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pastix-5.2-backport.patch
+	"${FILESDIR}"/${P}-adaolc-backport.patch
+)
 
 src_unpack() {
 	default
@@ -24,12 +59,21 @@ src_unpack() {
 }
 
 src_prepare() {
+	sed \
+		-e 's:-g2::g' \
+		-i cmake/EigenConfigureTesting.cmake || die
+
 	sed -i CMakeLists.txt \
 		-e "/add_subdirectory(demos/d" \
-		-e "/add_subdirectory(blas/d" \
-		-e "/add_subdirectory(lapack/d" \
 		|| die "sed disable unused bundles failed"
 
+	if ! use test; then
+		sed -i CMakeLists.txt \
+			-e "/add_subdirectory(blas/d" \
+			-e "/add_subdirectory(lapack/d" \
+			|| die "sed disable unused bundles failed"
+	fi
+
 	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
 
 	sed \
@@ -47,10 +91,17 @@ src_compile() {
 src_test() {
 	local mycmakeargs=(
 		-DEIGEN_BUILD_TESTS=ON
-		-DEIGEN_TEST_NO_FORTRAN=ON
-		-DEIGEN_TEST_NO_OPENGL=ON
+		-DEIGEN_TEST_ALTIVEC="$(usex altivec)"
+		-DEIGEN_TEST_OPENMP="$(usex openmp)"
+		-DEIGEN_TEST_SSE2="$(usex cpu_flags_x86_sse2)"
+		-DEIGEN_TEST_SSE3="$(usex cpu_flags_x86_sse3)"
+		-DEIGEN_TEST_SSE4_1="$(usex cpu_flags_x86_sse4_1)"
+		-DEIGEN_TEST_SSE4_2="$(usex cpu_flags_x86_sse4_2)"
+		-DEIGEN_TEST_SSSE3="$(usex cpu_flags_x86_ssse3)"
+#		-DEIGEN_TEST_X87="$(usex cpu_flags_x86_x87)"
 	)
 	cmake-utils_src_configure
+	cmake-utils_src_compile blas
 	cmake-utils_src_compile buildtests
 	cmake-utils_src_test
 }
diff --git a/dev-cpp/eigen/eigen-3.2.8.ebuild b/dev-cpp/eigen/eigen-3.2.8-r1.ebuild
similarity index 92%
rename from dev-cpp/eigen/eigen-3.2.8.ebuild
rename to dev-cpp/eigen/eigen-3.2.8-r1.ebuild
index f5b6212c1ecd..447ca29c55df 100644
--- a/dev-cpp/eigen/eigen-3.2.8.ebuild
+++ b/dev-cpp/eigen/eigen-3.2.8-r1.ebuild
@@ -32,10 +32,6 @@ src_prepare() {
 
 	sed -i -e "/Unknown build type/d" CMakeLists.txt || die
 
-	sed \
-		-e '/Cflags/s|:.*|: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}|g' \
-		-i eigen3.pc.in || die
-
 	cmake-utils_src_prepare
 }
 
diff --git a/dev-cpp/eigen/files/eigen-3.2.8-adaolc-backport.patch b/dev-cpp/eigen/files/eigen-3.2.8-adaolc-backport.patch
new file mode 100644
index 000000000000..82547e11951a
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.2.8-adaolc-backport.patch
@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Gael Guennebaud <g.gael@free.fr>
+# Date 1448895622 -3600
+# Node ID e515e2706d00294a5749db7832d10ea366b9389f
+# Parent  eb4bf011a2ea5fc4ddb0aa5332d6e616198ed886
+Update ADOL-C support.
+
+diff --git a/unsupported/Eigen/AdolcForward b/unsupported/Eigen/AdolcForward
+--- a/unsupported/Eigen/AdolcForward
++++ b/unsupported/Eigen/AdolcForward
+@@ -25,7 +25,7 @@
+ #ifndef NUMBER_DIRECTIONS
+ # define NUMBER_DIRECTIONS 2
+ #endif
+-#include <adolc/adouble.h>
++#include <adolc/adtl.h>
+ 
+ // adolc defines some very stupid macros:
+ #if defined(malloc)
+diff --git a/unsupported/test/forward_adolc.cpp b/unsupported/test/forward_adolc.cpp
+--- a/unsupported/test/forward_adolc.cpp
++++ b/unsupported/test/forward_adolc.cpp
+@@ -13,8 +13,6 @@
+ #define NUMBER_DIRECTIONS 16
+ #include <unsupported/Eigen/AdolcForward>
+ 
+-int adtl::ADOLC_numDir;
+-
+ template<typename Vector>
+ EIGEN_DONT_INLINE typename Vector::Scalar foo(const Vector& p)
+ {
+@@ -123,7 +121,7 @@
+ 
+ void test_forward_adolc()
+ {
+-  adtl::ADOLC_numDir = NUMBER_DIRECTIONS;
++  adtl::setNumDir(NUMBER_DIRECTIONS);
+ 
+   for(int i = 0; i < g_repeat; i++) {
+     CALL_SUBTEST(( adolc_forward_jacobian(TestFunc1<double,2,2>()) ));
diff --git a/dev-cpp/eigen/files/eigen-3.2.8-pastix-5.2-backport.patch b/dev-cpp/eigen/files/eigen-3.2.8-pastix-5.2-backport.patch
new file mode 100644
index 000000000000..fafaf3a68629
--- /dev/null
+++ b/dev-cpp/eigen/files/eigen-3.2.8-pastix-5.2-backport.patch
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User Gael Guennebaud <g.gael@free.fr>
+# Date 1393589499 -3600
+# Node ID b88efb384b160880131ad17e39bb690719112bfa
+# Parent  576120ad694efe29b70999576964d3816288fb4e
+Fix PaStiX support for Pastix 5.2
+
+diff --git a/Eigen/src/PaStiXSupport/PaStiXSupport.h b/Eigen/src/PaStiXSupport/PaStiXSupport.h
+--- a/Eigen/src/PaStiXSupport/PaStiXSupport.h
++++ b/Eigen/src/PaStiXSupport/PaStiXSupport.h
+@@ -12,6 +12,14 @@
+ 
+ namespace Eigen { 
+ 
++#if defined(DCOMPLEX)
++  #define PASTIX_COMPLEX  COMPLEX
++  #define PASTIX_DCOMPLEX DCOMPLEX
++#else
++  #define PASTIX_COMPLEX  std::complex<float>
++  #define PASTIX_DCOMPLEX std::complex<double>
++#endif
++
+ /** \ingroup PaStiXSupport_Module
+   * \brief Interface to the PaStix solver
+   * 
+@@ -74,14 +82,14 @@
+   {
+     if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; }
+     if (nbrhs == 0) {x = NULL; nbrhs=1;}
+-    c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<COMPLEX*>(vals), perm, invp, reinterpret_cast<COMPLEX*>(x), nbrhs, iparm, dparm); 
++    c_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_COMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_COMPLEX*>(x), nbrhs, iparm, dparm); 
+   }
+   
+   void eigen_pastix(pastix_data_t **pastix_data, int pastix_comm, int n, int *ptr, int *idx, std::complex<double> *vals, int *perm, int * invp, std::complex<double> *x, int nbrhs, int *iparm, double *dparm)
+   {
+     if (n == 0) { ptr = NULL; idx = NULL; vals = NULL; }
+     if (nbrhs == 0) {x = NULL; nbrhs=1;}
+-    z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<DCOMPLEX*>(vals), perm, invp, reinterpret_cast<DCOMPLEX*>(x), nbrhs, iparm, dparm); 
++    z_pastix(pastix_data, pastix_comm, n, ptr, idx, reinterpret_cast<PASTIX_DCOMPLEX*>(vals), perm, invp, reinterpret_cast<PASTIX_DCOMPLEX*>(x), nbrhs, iparm, dparm); 
+   }
+ 
+   // Convert the matrix  to Fortran-style Numbering
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
index b490b1a48a30..13d0755d25f3 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-cpp/glibmm/glibmm-2.46.3.ebuild b/dev-cpp/glibmm/glibmm-2.46.3.ebuild
index 0c95ad38ccae..2a1607a08532 100644
--- a/dev-cpp/glibmm/glibmm-2.46.3.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.46.3.ebuild
@@ -12,7 +12,7 @@ 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"
+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="
diff --git a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
index 0738d02bd5a6..3732877093e9 100644
--- a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
+++ b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc examples"
 
 # glibmm dep is because build fails with older versions...
diff --git a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
index 6353a7818121..e800ea91b8a2 100644
--- a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
+++ b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="C++ bindings for gtkglext"
 HOMEPAGE="https://projects.gnome.org/gtkglext/"
 SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 SLOT="1.0"
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
index 167b787a6ee8..bd2c9af819fb 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
index 401ce9966c41..42d8488883f6 100644
--- a/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+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 )"
 
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
index 062ecefd5b67..a05188b9bd89 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit flag-o-matic gnome2
 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 SLOT="2.0"
 LICENSE="LGPL-2.1"
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
index e1903c904c82..c598ac4ee496 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
@@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 SLOT="3.0"
 LICENSE="LGPL-2.1"
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch b/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch
new file mode 100644
index 000000000000..348a590f4c30
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch
@@ -0,0 +1,21 @@
+From b572b60a5fdc630f7f3b31dfd5dbdd1ed48659ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@free.fr>
+Date: Thu, 16 Jul 2015 16:22:11 +0200
+Subject: [PATCH] Fix linking error when building with --with-boot
+
+---
+ src/libcmis/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libcmis/Makefile.am b/src/libcmis/Makefile.am
+index 3915d45..1955ea6 100644
+--- a/src/libcmis/Makefile.am
++++ b/src/libcmis/Makefile.am
+@@ -144,6 +144,7 @@ libcmis_@LIBCMIS_API_VERSION@_la_LIBADD = \
+ 	$(XML2_LIBS) \
+ 	$(CURL_LIBS) \
+ 	$(BOOST_SMART_PTR_LIBS) \
++	$(BOOST_DATE_TIME_LDFLAGS) \
+ 	$(BOOST_DATE_TIME_LIBS)
+ 
+ libcmis_@LIBCMIS_API_VERSION@_la_includedir = $(includedir)/libcmis-@LIBCMIS_API_VERSION@/libcmis
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch b/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch
new file mode 100644
index 000000000000..8c89ab8bfe33
--- /dev/null
+++ b/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch
@@ -0,0 +1,44 @@
+From 0ad3ec084d918be503a8ce971af1b54887d7726f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@free.fr>
+Date: Thu, 16 Jul 2015 16:23:06 +0200
+Subject: [PATCH] Getting cppcheck-test to pass again
+
+---
+ Makefile.am         | 1 +
+ cppcheck-suppress   | 3 +++
+ cppcheck-test.sh.in | 4 +++-
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 cppcheck-suppress
+
+diff --git a/Makefile.am b/Makefile.am
+index ebf1f3b..9263497 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,6 +35,7 @@ EXTRA_DIST = \
+ 	COPYING.LGPL \
+ 	doc/cmis-client.xml \
+ 	cppcheck-test.sh \
++	cppcheck-suppress \
+ 	qa/libcmis/data
+ 
+ if ENABLE_CPPCHECK
+diff --git a/cppcheck-suppress b/cppcheck-suppress
+new file mode 100644
+index 0000000..9ef8482
+--- /dev/null
++++ b/cppcheck-suppress
+@@ -0,0 +1,3 @@
++publicAllocationError:qa/libcmis/test-decoder.cxx
++noExplicitConstructor
++noExplicitCopyMoveConstructor
+diff --git a/cppcheck-test.sh.in b/cppcheck-test.sh.in
+index 20a73f8..175e0f5 100755
+--- a/cppcheck-test.sh.in
++++ b/cppcheck-test.sh.in
+@@ -1,3 +1,5 @@
+ #!/bin/sh
+-@CPPCHECK@ -q --enable=style,performance,portability,information --error-exitcode=1 @SRCDIR@
++@CPPCHECK@ -q --enable=style,performance,portability,information \
++           --suppressions-list=./cppcheck-suppress \
++           --error-exitcode=1 @SRCDIR@
+ exit $?
diff --git a/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild
index 96b3308f908d..38a6a64c74aa 100644
--- a/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.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$
 
@@ -22,16 +22,12 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 IUSE="static-libs man test"
 
-RDEPEND="
-	!dev-cpp/libcmis:0
-	!dev-cpp/libcmis:0.2
-	!dev-cpp/libcmis:0.3
-	!dev-cpp/libcmis:0.4
+COMMON_DEPEND="
 	dev-libs/boost:=
 	dev-libs/libxml2
 	net-misc/curl
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	man? (
 		app-text/docbook2X
@@ -42,9 +38,17 @@ DEPEND="${RDEPEND}
 		dev-util/cppunit
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	!dev-cpp/libcmis:0
+	!dev-cpp/libcmis:0.2
+	!dev-cpp/libcmis:0.3
+	!dev-cpp/libcmis:0.4
+"
 
 src_prepare() {
 	epatch "${WORKDIR}/${P}-gcc5.patch"
+	epatch "${FILESDIR}/${P}-boost-linking.patch" \
+		"${FILESDIR}/${P}-cppcheck.patch"
 	eautoreconf
 }
 
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index dfc690240e01..c2086115172d 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code"
 [[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
@@ -22,16 +22,12 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="static-libs man test"
 
-RDEPEND="
-	!dev-cpp/libcmis:0
-	!dev-cpp/libcmis:0.2
-	!dev-cpp/libcmis:0.3
-	!dev-cpp/libcmis:0.4
+COMMON_DEPEND="
 	dev-libs/boost:=
 	dev-libs/libxml2
 	net-misc/curl
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	man? (
 		app-text/docbook2X
@@ -42,8 +38,15 @@ DEPEND="${RDEPEND}
 		dev-util/cppunit
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	!dev-cpp/libcmis:0
+	!dev-cpp/libcmis:0.2
+	!dev-cpp/libcmis:0.3
+	!dev-cpp/libcmis:0.4
+"
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
index 96f1165b9485..48e7ffcec8f9 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild b/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
index 4e681b7e87d5..0dd40e4c0586 100644
--- a/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
+++ b/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild b/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
index 57c819423e08..55a444152de5 100644
--- a/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
+++ b/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
index 52c813635f37..64c1d3452c29 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-cpp/mm-common/mm-common-0.9.10.ebuild b/dev-cpp/mm-common/mm-common-0.9.10.ebuild
index dfb212fbe2fc..15139f67b02b 100644
--- a/dev-cpp/mm-common/mm-common-0.9.10.ebuild
+++ b/dev-cpp/mm-common/mm-common-0.9.10.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-cpp/pangomm/pangomm-2.38.1.ebuild b/dev-cpp/pangomm/pangomm-2.38.1.ebuild
index 38969e92770c..bb8158bf5980 100644
--- a/dev-cpp/pangomm/pangomm-2.38.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.38.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-db/4store/4store-1.1.5.ebuild b/dev-db/4store/4store-1.1.5-r1.ebuild
similarity index 98%
rename from dev-db/4store/4store-1.1.5.ebuild
rename to dev-db/4store/4store-1.1.5-r1.ebuild
index 51f47be8b999..a55defb8f631 100644
--- a/dev-db/4store/4store-1.1.5.ebuild
+++ b/dev-db/4store/4store-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils user
 
@@ -20,6 +20,7 @@ IUSE=""
 # < http://4store.org/trac/wiki/Dependencies
 DEPEND="media-libs/raptor
 		>=dev-libs/rasqal-0.9.18
+		dev-libs/glib
 		dev-libs/libxml2
 		dev-libs/libpcre
 		sys-libs/readline
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1955db8822d3..0300737ea976 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,6 @@
 DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
 DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
+DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64
 DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
 DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
 DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
diff --git a/dev-db/mariadb/mariadb-10.0.24.ebuild b/dev-db/mariadb/mariadb-10.0.24.ebuild
new file mode 100644
index 000000000000..7ee3980439b5
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.0.24.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20151223-1501Z"
+# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
+WSREP_REVISION="25"
+SUBSLOT="18"
+MYSQL_PV_MAJOR="5.6"
+
+inherit toolchain-funcs mysql-multilib-r1
+
+HOMEPAGE="http://mariadb.org/"
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+
+IUSE="bindist odbc oqgraph pam sphinx tokudb xml"
+RESTRICT="!bindist? ( bindist )"
+
+REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+COMMON_DEPEND="
+	!bindist? ( >=sys-libs/readline-4.1:0=	)
+	server? (
+		extraengine? (
+			odbc? ( dev-db/unixODBC:0= )
+			xml? ( dev-libs/libxml2:2= )
+		)
+		oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+		pam? ( virtual/pam:0= )
+		tokudb? ( app-arch/snappy )
+	)
+	>=dev-libs/libpcre-8.35:3=
+"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+	${COMMON_DEPEND}"
+RDEPEND="${RDEPEND} ${COMMON_DEPEND}
+	perl? ( !dev-db/mytop
+		virtual/perl-Getopt-Long
+		dev-perl/TermReadKey
+		virtual/perl-Term-ANSIColor
+		virtual/perl-Time-HiRes )
+"
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+
+src_configure(){
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+			-DWITH_JEMALLOC=$(usex jemalloc system)
+			-DWITH_PCRE=system
+	)
+	if use server ; then
+		# Federated{,X} must be treated special otherwise they will not be built as plugins
+		if ! use extraengine ; then
+			MYSQL_CMAKE_NATIVE_DEFINES+=(
+				-DWITHOUT_FEDERATED=1
+				-DWITHOUT_FEDERATEDX=1 )
+		fi
+
+		MYSQL_CMAKE_NATIVE_DEFINES+=(
+			$(mysql-cmake_use_plugin oqgraph OQGRAPH)
+			$(mysql-cmake_use_plugin sphinx SPHINX)
+			$(mysql-cmake_use_plugin tokudb TOKUDB)
+			$(mysql-cmake_use_plugin pam AUTH_PAM)
+			-DWITHOUT_CASSANDRA=0
+			$(mysql-cmake_use_plugin extraengine SEQUENCE)
+			$(mysql-cmake_use_plugin extraengine SPIDER)
+			$(mysql-cmake_use_plugin extraengine CONNECT)
+			-DCONNECT_WITH_MYSQL=1
+			-DCONNECT_WITH_LIBXML2=$(usex xml)
+			-DCONNECT_WITH_ODBC=$(usex odbc)
+			-DWITHOUT_MROONGA=1
+		)
+	fi
+	mysql-multilib-r1_src_configure
+}
+
+# Official test instructions:
+# USE='embedded extraengine perl server openssl static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	if use server ; then
+
+		# Bug #213475 - MySQL _will_ object strenously if your machine is named
+		# localhost. Also causes weird failures.
+		[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might run out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql main.bootstrap
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+		# fails due to bad cleanup of previous tests when run in parallel
+		# The tool is deprecated anyway
+		# Bug 532288
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help main.bootstrap \
+			archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}" || die
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd || die
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
diff --git a/dev-db/rqlite/rqlite-1.0.ebuild b/dev-db/rqlite/rqlite-1.0.ebuild
index 0f178d7b6b0d..053d71253fb1 100644
--- a/dev-db/rqlite/rqlite-1.0.ebuild
+++ b/dev-db/rqlite/rqlite-1.0.ebuild
@@ -58,6 +58,17 @@ 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%/*}")
diff --git a/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild b/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
index 1818a176fd2b..9cf26f8d6da8 100644
--- a/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
+++ b/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 	doc? ( https://launchpad.net/zeitgeist-sharp/${DIR_PV}/${DIR_PV2}/+download/${PN}-docs-${DIR_PV2}.tar.gz )"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 IUSE="doc"
 
diff --git a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
index 935b98754a8f..31690b1e5126 100644
--- a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
+++ b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
index 08934f80e8aa..6ecb08ecffb5 100644
--- a/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
+++ b/dev-haskell/blaze-builder-enumerator/blaze-builder-enumerator-0.2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+newbuilder"
 
 RDEPEND=">=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
diff --git a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild b/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
index 4150c160d4b9..8e20c67088a8 100644
--- a/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
+++ b/dev-haskell/blaze-builder/blaze-builder-0.4.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-haskell/bytestring-builder:=[profile?]
diff --git a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild b/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
index a8753f02eb8e..a3eec0a0325c 100644
--- a/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
+++ b/dev-haskell/blaze-html/blaze-html-0.8.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild b/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
index e4c72824f307..04479811f701 100644
--- a/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
+++ b/dev-haskell/blaze-markup/blaze-markup-0.7.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?]
diff --git a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
index 70c5d2465740..d5f9d984b3a3 100644
--- a/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
+++ b/dev-haskell/bytestring-mmap/bytestring-mmap-0.2.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/enumerator/enumerator-0.4.20.ebuild b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
index 948e9d1fa897..288c1c6153d1 100644
--- a/dev-haskell/enumerator/enumerator-0.4.20.ebuild
+++ b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.7:=[profile?]
diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
index 1f9732af5fa9..a0f634a9e852 100644
--- a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fast-bignum libressl"
 
 RESTRICT=test # whoops, not good
diff --git a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
index cb4661a2f407..66d072337d97 100644
--- a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
+++ b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug portable"
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild b/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
index fd012aa6756b..737ed731a004 100644
--- a/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
+++ b/dev-haskell/snap-server/snap-server-0.9.5.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug openssl portable"
 
 RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
diff --git a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
index 51fd04512f0b..f70e861a4bf7 100644
--- a/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
+++ b/dev-haskell/time-locale-compat/time-locale-compat-0.1.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-haskell/old-locale:=[profile?]
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
index 5b6b2eed3c1b..a9d7b6f5a318 100644
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
+++ b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
diff --git a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
new file mode 100644
index 000000000000..cc6b6662ffe6
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library for working with XML"
+HOMEPAGE="http://dom4j.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/dom4j/${P}.tar.gz
+	mirror://gentoo/${P}-java5.patch.bz2"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+	dev-java/relaxng-datatype:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junitperf:0
+	)
+	>=virtual/jdk-1.6"
+
+PDEPEND="dev-java/jaxen:1.1"
+
+java_prepare() {
+	# Circular deps with jaxen #212993
+	find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
+
+	# Add missing methods to compile on Java 5 #137970
+	epatch "${WORKDIR}/${P}-java5.patch"
+}
+
+# 0 - Requires X11.
+# 1 - Fails with JDK 1.7.
+# 2 - Fails with JDK 1.6.
+JAVA_RM_FILES=(
+	src/test/org/dom4j/bean/BeansTest.java
+	src/test/org/dom4j/io/StaxTest.java
+	src/test/org/dom4j/rule/RuleTest.java
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+EANT_BUILD_TARGET="clean package"
+EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
+EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "build/${PN}.jar"
+	java-pkg_register-dependency jaxen-1.1
+	use doc && java-pkg_dojavadoc build/doc/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
new file mode 100644
index 000000000000..2c856f088439
--- /dev/null
+++ b/dev-java/jakarta-oro/jakarta-oro-2.0.8-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_J=${PN%%-*}
+MY_O=${PN##*-}
+
+DESCRIPTION="A set of text-processing Java classes"
+HOMEPAGE="http://jakarta.apache.org/oro/index.html"
+SRC_URI="http://archive.apache.org/dist/${MY_J}/${MY_O}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	java-pkg_clean
+	mv src/java/examples examples || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index df04a942e691..e525e645380d 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -3,10 +3,15 @@ DIST sbt-0.13.10_rc2-ivy2-deps.tar.bz2 139970194 SHA256 b3ef28fbc330d8b8218712a4
 DIST sbt-0.13.10_rc2-sbt-deps.tar.bz2 38778951 SHA256 f2be26d49010fa521b4a0e9a112c465107838f5250883de4bc132926ccd685fa SHA512 c929562d18e2e5032d502556a960b25fa707c2893172425c2c3b5365a86ccd63729ce8795f12fd1aced5b39267f6db4b8e9d0c1eaf00ba20b071fac9044157f8 WHIRLPOOL b75096e0b2429a104b548e601e06fc5b3e452bda39d4fc434d8f98137275899a5c40ac2bb528324dd621eef4aa17e952648c9698cc4eeedd6e8aeb391509db16
 DIST sbt-0.13.10_rc2-src.tar.bz2 35017169 SHA256 c34051649a8c998a98d5ff401e622d6c3e54fc15b6e1aeac7e223c5ff8ce54aa SHA512 7e734fdecc631cc0307c09e6706b761dd55d1cb6a03aa29a0cd5826d86bfa44dde29ebc05bca7f947351a6b6510caef51d0c3df2b07d60895b41f074c319d1b8 WHIRLPOOL de34b47a87af7f77a2ee00230901cf21015312359f29cff8689692b7c9d2f148a8233224a3b5b488c63a55cde695b0928000938e6608c1437e4be2287ddc026d
 DIST sbt-0.13.10_rc2-test-deps.tar.bz2 266656 SHA256 62d0ed5b43898a42696f8b148e933d70871c2f75bf3f6b20ac39cea00b327f17 SHA512 7e30459f010eb9c8ffba8e8e4da90bcb7d03cdd4347e63d0207a9bf9b9ddeb38b68d2798c98452ea81bcddc9973e287066603ce06ebadf56c006f25e76fdb57d WHIRLPOOL e4c06db36cc2b0e4417a81c961bc470caa169e358734ab7f7b71103547286704e6cfd104fe342afd7df0270300073a695ee35342944e25a65e96bd036bb5a953
+DIST sbt-0.13.11-gentoo-binary.tar.bz2 144170371 SHA256 ca13e6d5751de14ac0fe3542f80c42c3dc74fabd3f897455b8f93391ab465f08 SHA512 705f8a5e3065ee6d88ca0044a1e0b55856e4cf167172fc3102503ff28b0992bc918da9ab8541320474abe7dd4956d2a0d33df1709894bace225993e32b85b667 WHIRLPOOL 0b94e74ebb827d9517d621606321e8fd0ca72c74b6f40776248e1bbcdf64e328c3bf83ece4c37adbbdaadb273f0951275a21d278ea3307e904a76c44809b4321
+DIST sbt-0.13.11-ivy2-deps.tar.bz2 139796284 SHA256 d8ad25a99e1dd8ebbc29955844543a1cee8bbd845cca9bb4fa92b62c27673a29 SHA512 e431e00884dbf58ca911d64da726b41b8aeae9987ae2725705c9c45b4601162e45d310f933e4214cf8a4d21ba9e7207365d9ba352cbe1511ce09f59cd33da033 WHIRLPOOL b56ba91892ee2dbb1d9d9609ffd8417184e291fa8c03f8a115757301c412a8d141a17ae315ac916067bab5b49d74f16cb82da497c8790c212f3ccc068721e24f
+DIST sbt-0.13.11-sbt-deps.tar.bz2 38783848 SHA256 c2059a2513cbee50afe506d1fb0511b384df99757273d941b136e5bb3155ca7e SHA512 53020538eac11d6ae268436987d98093f017f421750496080908fad36eb9148a4cce41ab1a231ff1a35868c5c07cc8e338f1793fc91d044802b3e95b900e9cc8 WHIRLPOOL 0e4617b728536be9adfcf683b1575a522c5c0f073098c7f685003f0a340bfc4fff06031252016227b8af38f666296185815508b89bb7e82334276e55c707e16e
+DIST sbt-0.13.11-src.tar.bz2 35163092 SHA256 1b987725b4e57d6139b02c9d43b18d6ec43880681cccdfca3a29c803e79f6494 SHA512 95065c452fbbf2a206ad8d8518f083abe608e8bad1075848fa7a4ad797e8a10e4127823cdb8502f4d9bd0eb01867298af7d69895eb1470bf71deba354871dd86 WHIRLPOOL 652ba691ea2dccf6eb22ea2b43d9b96e15597cb8ce2325eacd912752a60854f982e1a6fec8c049e144042c10e98b888a66b3fe923c63447ef46e6582786e4a81
 DIST sbt-0.13.8-gentoo-binary.tar.bz2 1048674 SHA256 4a2b22c9d9fbe922d5a5336d88ca21f18b2545850fec16485c824aee43df53e1 SHA512 9a5707601387d604b746ea21145a3c7735dd4b6d36541111b47519b66e5abc929ecc96ff52e144ed39a3db947204a1956e19394a1848e3fd8904f9a98ec24816 WHIRLPOOL 4fb1bde15ab57260a25b0a4a1634122af2e2b9d6cd35d3a9c693d9bba6c398bee489f05bf29a763a60d7a04f54823bdd9fc54ec5a2809900b28f890930649fc7
 DIST sbt-0.13.8-ivy2-deps.tar.bz2 124672043 SHA256 565ba7434316a3ab2f61f58b4bc57317e5c2ae7c9ee95061c39cfddd5767a355 SHA512 47b2f235b7d5883086f8246265e9081a50dcdaede43550a1c0de1c85a9ebf24b47e1331b662aa5c0faebaf22a37849ffb2c1f25a7592c461e62f582984ad4b70 WHIRLPOOL f92b2cd087d51f0ae31d5ac93d1dca7214ace6df8c06b050287007f05697e81ac14758368730e6df45043ba80167b9581e636b0364d5ba3a5c7352fafd7e5007
 DIST sbt-0.13.8-sbt-deps.tar.bz2 88352931 SHA256 d0eab3858f389e201277d1ead68352172830b17dd8343f09e0e63e4880a5e20e SHA512 a6e886f5f18821c26df28a2e8cf2773b4841854fc1bd4dfa43924089966020da5affd635da96a8e13efc7c06be6a5bf53697ca91f5fbf41efcdf8dda00e8428d WHIRLPOOL 54744676b33b11ffb350b5a543986efd5cd629594ce4bac5154a78df233619a92a2a4842659acf9c15533e764d24333183372f136b3b1f7463bbe55347c41b8f
 DIST sbt-0.13.8-src.tar.bz2 32766054 SHA256 5225864c54e5718dc68cfcd554a7215bd028947d61ed9522e2ad9d0a19cbdd83 SHA512 f6c834c6294c957e8d5b89a3a616f23a980cca1f882695d09a6e0080d1013227ba3bac86942b39c13e49fb6ac9fb72c3478df24ec8549b8b9812ea352932fff8 WHIRLPOOL 5054578505fe35b6c5f269c72b921920cf232a1efed18da5cd1833457d46f4e4342988be46539001b4dcfcfc6c807785915f4d0791af939dc83018ffcc03effe
 DIST sbt-0.13.8-test-deps.tar.bz2 40704285 SHA256 7cb252d69b5868905e0592df7ef9a83ce09f75cb10a72bc9dcd649286bb524a3 SHA512 a79ea9c81abc436168f04f674ffef4fee6f7c7a5dede5a3060e2e2bd9a9863dd5f1c7b31c02f3823fb5a67b2bb43c44d306efb59468f625e4db277cface47cd0 WHIRLPOOL 268ea150c5ca2fe1988317e0616262de814e2aa7213f64b99baf389c3e67e2093a04765ac27f08bd585fe33c77d9dd8c7a0ba8d3bd77d937d9a7260dab72c23a
+DIST sbt-launch-0.13.11.jar 1210231 SHA256 c63ade35a7a7aa0d8e3bdc7c2353ce79b045083cfabf6bc6fab88584f6100bc1 SHA512 9db3d3e953e4246b09ce2265b76463b6000c6d1c9d1328eb0deb1b67e9c955816ef67f6aeaeca22dc46e27cc71ba833545ab39c5351b8230609c021ca9e818b9 WHIRLPOOL 6650144da7aef195779c4d23c594fee9c7f79e7b2758bb2c98c83732f75656b0143ec73023a98677201502a813c0e37bbec48cebbc6fe520484ec6bd53fb4019
 DIST sbt-launch-0.13.7.jar 1208385 SHA256 6570bb03df6138ffaa7ac0bbe35eb4ea79062d1146b6929c75cf238d14dd9158 SHA512 ddc62dd85b552a7157ae0c19d0161d77a929adeb4ea81042a3a38c3d979e32674b9174aef47d458e9a7c8ea7942c08f1a7177b9bc739f7cd9e0484aef9915204 WHIRLPOOL 63841a401739aa3eab24632fcec41dc5c186502f4b80fe782106a0c6448b1da2321bf2a7a0b0f83473f7c073cce2ac8f5f85440d955acc191a73bd95200cb2cf
 DIST sbt-launch-0.13.9.jar 1210236 SHA256 4fddf384322c8aa02671ab89e229ab1e703613eee350e3af6c7790916d43f96d SHA512 c447e7be5b18689e4821dbde699fba230214a34059aa38441dcff13938d3cb351f1bd4266d99a2dcd40a80a7c623a14483755a461417750ab60635ab73c2fdde WHIRLPOOL 61806d9140b9b64b8a60f5f6a0e5d16bb6b16e643185b874780af0b3b32a9e62311d86e4a3fc3526735eb590a1a98f00881e60789c5b079521da660aea319171
diff --git a/dev-java/sbt/sbt-0.13.11.ebuild b/dev-java/sbt/sbt-0.13.11.ebuild
new file mode 100644
index 000000000000..991ac8615188
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.11.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# repoman gives LIVEVCS.unmasked even with EGIT_COMMIT, so create snapshot
+inherit eutils java-pkg-2 # git-r3
+
+MY_PV="0.13.11"
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${MY_PV}"
+
+SV="2.10"
+
+DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
+HOMEPAGE="http://www.scala-sbt.org/"
+EGIT_COMMIT="v${PV}"
+EGIT_REPO_URI="https://github.com/sbt/sbt.git"
+SRC_URI="!binary?
+(
+	https://dev.gentoo.org/~gienah/snapshots/${P}-src.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+	https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2
+	http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${MY_PV}/${L_PN}.jar -> ${L_P}.jar
+)
+binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND=">=virtual/jdk-1.7
+	>=dev-lang/scala-2.10.6:${SV}"
+RDEPEND=">=virtual/jre-1.7
+	dev-lang/scala:*"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. Create the sbt src snapshot:
+# git clone https://github.com/sbt/sbt.git sbt-0.13.11
+# cd sbt-0.13.11
+# git checkout v0.13.11
+# cd ..
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-src.tar.bz2 \
+# sbt-0.13.11
+# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.bz2
+# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.bz2 and
+# https://dev.gentoo.org/~gienah/snapshots/${P}-test-deps.tar.bz2
+# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )
+# from SRC_URI
+# 3. Comment the sbt publishLocal line in src_compile.
+# 4. try:
+# FEATURES='noclean -test' emerge -v -1 dev-java/sbt
+# It should fail in src_install since the sbt publishLocal is not done.
+# Check if it downloads more stuff in
+# src_compile to ${WORKDIR}/.ivy2 and ${WORKDIR}/.sbt.
+# 5. If some of the downloads fail, it might be necessary to run the sbt compile
+# again manually to obtain all the dependencies, if so (with jdk 1.6):
+# cd to ${S}
+# export EROOT=/
+# export WORKDIR='/var/tmp/portage/dev-java/sbt-0.13.11/work'
+# export SV="2.10"
+# export L_P=sbt-0.13.11
+# export PATH="/usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
+# sbt compile
+# cd ${WORKDIR}
+# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+# 6. cd ${WORKDIR}
+# tar -cjf /usr/portage/distfiles/sbt-0.13.11-ivy2-deps.tar.bz2 .ivy2
+# tar -cjf /usr/portage/distfiles/sbt-0.13.11-sbt-deps.tar.bz2 .sbt
+# Uncomment the sbt publishLocal line in src_compile.
+# 7. It *might* download more dependencies for src_test, however the presence of some of these may cause
+# the src_compile to fail.  So download them seperately as root so we can identify the
+# additional files.  Note: src_test creates some files in ${WORKDIR}/.m2 which are can
+# hopefully be ignored. As root:
+# cd ${S}
+# ${S}/sbt-0.13.11 test
+# cd ${WORKDIR}
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-test-deps.tar.bz2 \
+# $(find .ivy2 .sbt -uid 0 -type f -print)
+# Note: It might not download anything in src_test, in which case sbt-0.13.11-test-deps.tar.bz2
+# is not required.
+# 8. Create the binary
+# cd $WORDKIR
+# tar --owner=portage --group=portage -cjf /usr/portage/distfiles/sbt-0.13.11-gentoo-binary.tar.bz2 \
+# sbt-0.13.11 .ivy2/local
+# 9. Undo the earlier temporary edits to the ebuild.
+
+src_unpack() {
+	# if ! use binary; then
+	# 	git-r3_src_unpack
+	# fi
+	# Unpack tar files only.
+	for f in ${A} ; do
+		[[ ${f} == *".tar."* ]] && unpack ${f}
+	done
+}
+
+java_prepare() {
+	if ! use binary; then
+		mkdir "${WORKDIR}/${L_P}" || die
+		cp -p "${DISTDIR}/${L_P}.jar" "${WORKDIR}/${L_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${L_P}/sbt"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${L_P}/sbt-launch.jar" "\$@"
+		EOF
+		cat <<- EOF > "${S}/${P}"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=512M"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${L_P}/sbt" "${S}/${P}" || die
+		local SCALA_PVR="$(java-config --query=PVR --package=scala-${SV})"
+		local SFV="${SCALA_PVR/-*}"
+		sed -e "s@scalaVersion := \"2.10.4\",@scalaVersion := \"${SFV}\",\n  scalaHome := Some(file(\"/usr/share/scala-${SV}\")),@" \
+			-i "${S}/build.sbt" || die
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}"
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
+		cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("$(java-pkg_get-vm-version)")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	if ! use binary; then
+		export PATH="${EROOT}usr/share/scala-${SV}/bin:${S}:${PATH}"
+		"${S}/${P}" -Dsbt.log.noformat=true test || die
+	fi
+}
+
+src_install() {
+	# Place sbt-launch.jar at the end of the CLASSPATH
+	java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print | grep -v sbt-launch.jar) \
+				   $(find "${WORKDIR}"/.ivy2/local -name sbt-launch.jar -print)
+	local ja="-Dsbt.version=${PV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+	java-pkg_current-vm-matches "1.7" && ja+=" -XX:MaxPermSize=512M"
+	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
+}
diff --git a/dev-java/velocity-dvsl/Manifest b/dev-java/velocity-dvsl/Manifest
new file mode 100644
index 000000000000..621ac643babe
--- /dev/null
+++ b/dev-java/velocity-dvsl/Manifest
@@ -0,0 +1 @@
+DIST velocity-dvsl-1.0.zip 91539 SHA256 f7b05089c38f4cd28700bb4e57c856a22c3a4700d2812c5a4c18a42bf0b78d2b SHA512 0f431347706143a76d93d58f44a534a566780e27ba3ec43e48e4268b88a5fc523850a693800b730bee3a26d1c03339b24603f7eacabf716d199a9974d95c1d01 WHIRLPOOL 9532e6b5d8737e98f67dff4023fbc0800666ff8fc616ff2233297ca506ea56661742830f663d15fee319bf5d2f06ff722cd498e5a926a1a644dd8023bbcde266
diff --git a/dev-java/velocity-dvsl/metadata.xml b/dev-java/velocity-dvsl/metadata.xml
new file mode 100644
index 000000000000..eeaecef8a654
--- /dev/null
+++ b/dev-java/velocity-dvsl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
new file mode 100644
index 000000000000..6f932943387e
--- /dev/null
+++ b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Declarative Velocity Style Language."
+HOMEPAGE="http://velocity.apache.org/dvsl/devel/"
+SRC_URI="mirror://apache/velocity/dvsl/${PV}/${P}-src.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/ant-core:0
+	dev-java/dom4j:1
+	dev-java/velocity:0"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="
+	dom4j-1
+	ant-core
+	velocity
+"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf test src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher "${PN}" --main org.apache.dvsl.DVSL
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
new file mode 100644
index 000000000000..bd3f8f37a088
--- /dev/null
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java framework for easy creation/rendering of documents"
+HOMEPAGE="http://velocity.apache.org"
+SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-java/jdom:0
+	dev-java/log4j:0
+	dev-java/ant-core:0
+	dev-java/werken-xpath:0
+	dev-java/jakarta-oro:2.0
+	dev-java/avalon-logkit:2.0
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/commons-collections:0
+	java-virtuals/servlet-api:2.3
+"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+	jdom
+	log4j
+	ant-core
+	werken-xpath
+	jakarta-oro-2.0
+	servlet-api-2.3
+	commons-logging
+	commons-lang-2.1
+	avalon-logkit-2.0
+	commons-collections
+"
+
+JAVA_SRC_DIR="src"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+	java-pkg_clean
+	rm -rf test src/test || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples examples
+}
diff --git a/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild b/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
index 6fcd5cd094d2..d0b2c6988e0b 100644
--- a/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
+++ b/dev-lang/go-bootstrap/go-bootstrap-1.4.3.ebuild
@@ -10,7 +10,7 @@ inherit eutils toolchain-funcs
 
 SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 # Upstream only supports go on amd64, arm and x86 architectures.
-KEYWORDS="-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="-* amd64 arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
 
 DESCRIPTION="Version of go compiler used for bootstrapping"
 HOMEPAGE="http://www.golang.org"
diff --git a/dev-lang/go/go-1.5.3.ebuild b/dev-lang/go/go-1.5.3.ebuild
index 8d4b5b1f367d..62e4a4d92048 100644
--- a/dev-lang/go/go-1.5.3.ebuild
+++ b/dev-lang/go/go-1.5.3.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
 	# go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
 	# Allowing other bootstrap options would enable arm64 and ppc64 builds.
-	KEYWORDS="-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A concurrent garbage collected and typesafe programming language"
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 9e2a3cf9f803..13df3102f272 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -2,3 +2,4 @@ DIST lazarus-1.0.12-0.tar.gz 47687878 SHA256 542ddd60f4a404d7020ed6962a545db910a
 DIST lazarus-1.2.2-0.tar.gz 51558117 SHA256 ac2154c38b3918a08d762977073e606c272c5d4ba5cb4805bf8cd25965f3bd58 SHA512 ed6d228eae355860a8608263205ce00569785f8e39e06990fe8f17a5d070c05e2602d42e9258e42b0345f857e02b287083898f56dc5f4069157c9bace136988c WHIRLPOOL 514b9eac0bd59a0621d6c30f16d9d78f384dd6efddda163ee97b73ab24a42e6e630ec8fa17bc271b02a209618cd104ccb98d07637c67035a84141f148945cacb
 DIST lazarus-1.2.4-0.tar.gz 51606253 SHA256 e8622f2b29988514c9b7b7ff6cf2058a8b73e9ef0fd7998c82e1e958d2347d28 SHA512 c1858a2b89402d3cfb4baa704cdeb51dc541bf5dcac91230f93f62035988b5e5fec3851bf033876128db5da18713389a9eb6ca73c944dae36c0d6fb30e7727f8 WHIRLPOOL fddb4d650e3400b2fe1cfde1d431be3d752f81dbe715b821f55368628097225ce9156e4065f58c27346cba5a041127c25e7cc80ca15b77aab9e6188cfdd3b215
 DIST lazarus-1.2.6-0.tar.gz 51618690 SHA256 c0c7e648716f27edd6f1adf908fd5733654c3cd3db6458582ccd4343a8605eea SHA512 f7f227621ee69b7056dd87dab19e2217496ac2f280e3aa6dacdac890e55dfb9595a0562c06e50cb4b4f50d021739785d840eb19ec6d77040febb86fe78a5a47a WHIRLPOOL aff1abb59380553e92d956d35393689eed55bd8684a8c182b048cea774236defe9107b0449131a7868526721658f72e7d0c68578a55d56e53e3a68dc7d51fe3a
+DIST lazarus-1.6.0-0.tar.gz 55911739 SHA256 cbce02be1ed902a4978a13144446023d955c0db69a1dba42c93a83b8a24f3ca8 SHA512 6ac84325aa2caf7896b3cb55df72199ab04bf25320257510b288cde8fb679161834dca9ad3d07d39c164c05ab35c0cd248651a13c826d454c0dc84a558589576 WHIRLPOOL 2e3b1ac39fd79dcb457bfbe22c73ddcf781e9e5f0c263d88bd9b6e2ff9e417f2e1094702e1bc190788a1f5a86470b8165bc586f22d02a8b370db9245cfd9131e
diff --git a/dev-lang/lazarus/lazarus-1.6.0.ebuild b/dev-lang/lazarus/lazarus-1.6.0.ebuild
new file mode 100644
index 000000000000..171ae1b2280c
--- /dev/null
+++ b/dev-lang/lazarus/lazarus-1.6.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+FPCVER="2.6.4"
+
+DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
+HOMEPAGE="http://www.lazarus.freepascal.org/"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.6/${P}-0.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
+SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="minimal"
+
+DEPEND=">=dev-lang/fpc-${FPCVER}[source]
+	net-misc/rsync
+	x11-libs/gtk+:2
+	>=sys-devel/binutils-2.19.1-r1:="
+RDEPEND="${DEPEND}
+	!=gnome-base/librsvg-2.16.1"
+
+RESTRICT="strip" #269221
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch
+
+	# Use default configuration (minus stripping) unless specifically requested otherwise
+	if ! test ${PPC_CONFIG_PATH+set} ; then
+		local FPCVER=$(fpc -iV)
+		export PPC_CONFIG_PATH="${WORKDIR}"
+		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
+			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
+		#sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
+	fi
+}
+
+src_compile() {
+	LCL_PLATFORM=gtk2 emake \
+		$(usex minimal "" "bigide") \
+		-j1
+}
+
+src_install() {
+	diropts -m0755
+	dodir /usr/share
+	# Using rsync to avoid unnecessary copies and cleaning...
+	# Note: *.o and *.ppu are needed
+	rsync -a \
+		--exclude="CVS"     --exclude=".cvsignore" \
+		--exclude="*.ppw"   --exclude="*.ppl" \
+		--exclude="*.ow"    --exclude="*.a"\
+		--exclude="*.rst"   --exclude=".#*" \
+		--exclude="*.~*"    --exclude="*.bak" \
+		--exclude="*.orig"  --exclude="*.rej" \
+		--exclude=".xvpics" --exclude="*.compiled" \
+		--exclude="killme*" --exclude=".gdb_hist*" \
+		--exclude="debian"  --exclude="COPYING*" \
+		--exclude="*.app" \
+		"${S}" "${ED%/}"/usr/share \
+		|| die "Unable to copy files!"
+
+	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
+	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
+	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
+	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
+	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
+
+	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
+}
diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index 7640cd437eb1..0b781a1689e0 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -5,6 +5,9 @@
 		A Borland Delphi lookalike for linux.
 		Uses the free pascal compiler.
 	</longdescription>
+	<maintainer type="person">
+            <email>amynka@gentoo.org</email>
+        </maintainer>
 	<use>
 		<flag name="minimal">Don't build extra packages from the
 			bigide component</flag>
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 70336966da61..9159496d20c1 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -1 +1,2 @@
 DIST MoarVM-2016.01.tar.gz 3314742 SHA256 d409b684c7c92b144b31cf7f0408f30ccbb033ce646f57d7fbaeb9683773e37b SHA512 019433a985c8245c231d533b8310fceda185a694681aaecb922602ad98897c636c40fbe1a36ba656af4c242b28315611f656454eb41f25e0f891b652210eb435 WHIRLPOOL f603e1f60667771e0200e731b37ff854346d00a0de484a9b3072f83e0ee624bc2b7d7e862c872d9062a4397adb5bfab31d835754966a7fe44490312c82a37e8e
+DIST MoarVM-2016.02.tar.gz 3313448 SHA256 3bdacebba98e6b2d3d10f12af0ab514dec27fb24b15ed00aef479b7d190ce40a SHA512 fdeb107e071bcd7a893f15f105e722543010a87710cbd2ac4ce322000c96c9dae5c5e661dd8d60e712c4fe22d860650a003485d75f95a5b19fcde266f8fe483d WHIRLPOOL 9ccb54d147d558b4fa52bfe9b098384b3d61dffba598db803828bb0cbbc8bae9fd6a527d093c07a421cd97a59952e11ffaf9c6cef93ce9b48778009558e96732
diff --git a/dev-lang/moarvm/moarvm-2016.02.ebuild b/dev-lang/moarvm/moarvm-2016.02.ebuild
new file mode 100644
index 000000000000..0e7c088bae43
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2016.02.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_PN="MoarVM"
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libuv"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/MoarVM-${PV}"
+
+src_configure() {
+	perl Configure.pl --prefix="/usr"|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index c9cefeeedc4b..76e7c0da11e7 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1 +1,2 @@
 DIST nqp-2016.01.tar.gz 5117110 SHA256 87875120af7167093643f2a35869d66a61f735220a9348627ba89cf294387c8b SHA512 e79668f7f5f3679fe3b93f63e1151da1eab109ef4acc6f8ae3da3d9e5c3da814440dd43279978b1a13f30647d7c52bda5575b02f366bd928965b06b47c6d6d91 WHIRLPOOL d2369417707332d8bc045f6f93da81e1301ec2599f197664d80e6edeefc1bc7a2147ad3b7e893eef0fb6b96adf2f68f5ab44b948801e266e68d99552253abeda
+DIST nqp-2016.02.tar.gz 5121833 SHA256 051ddd4bab8f73a688836d896340320ff7043a6ecbd5c53be099249e75e33b8d SHA512 9a3233e351ebdf73ed27d3eade2052936d1a49ea95d32a8176e426e7126c720e4a3f69dedc4067925272293329b08ab397f6a7523b9e4129952847fbd86fcf0d WHIRLPOOL 1bad2dc420d59f07c3d9b8d9dcc78d51a772ed2672419fc53e427c68e24fce5645a0dcfd4a4e138e6333f9e909297b49fafe190e6dc763cca8e52dce20309ec5
diff --git a/dev-lang/nqp/nqp-2016.02.ebuild b/dev-lang/nqp/nqp-2016.02.ebuild
new file mode 100644
index 000000000000..ab671dfb77de
--- /dev/null
+++ b/dev-lang/nqp/nqp-2016.02.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# still not working
+RESTRICT="test"
+
+inherit eutils multilib versionator
+
+GITCRAP=1d6b8cb
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc java +moar"
+REQUIRED_USE="|| ( java moar )"
+
+RDEPEND="
+	java? ( >=virtual/jre-1.7 )
+	moar? ( ~dev-lang/moarvm-${PV} )
+	dev-libs/libffi"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+S=${WORKDIR}/perl6-nqp-${GITCRAP}
+
+src_configure() {
+	use java && myconf+="jvm,"
+	use moar && myconf+="moar,"
+	perl Configure.pl --backend=${myconf} --prefix=/usr || die
+	# dirty hack to make dyncall not fail
+	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
+	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
+	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
+
+	# more dirty hack to allow building with newer gcc
+	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
+	sed -i -e 's/-Werror=nested-externs//' Makefile || die
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README.pod || die
+
+	if use doc; then
+		dodoc -r docs/* || die
+	fi
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 030bae90ea73..4ee253d28f34 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -1 +1,2 @@
 DIST rakudo-2016.01.1.tar.gz 2687265 SHA256 897d01bcb27c209bd51918bb5be6adc6e6ea9dbc2c6b65414f9ac081aa8c5d7b SHA512 31228d49577f5d25b306a987650af0ae11bb2fa80fcaeee421dbe88dc9812edd5a399999f8727dee11d74177b7b9bca0290e26c4240c7baed35fabb4c912f85f WHIRLPOOL 52b2d7d1a0461883b1d07bbb492994f7eb8930a8726565d9a4788883e16510fc052dc066bf8443e09042548d76a3f3ca1cb17be8baa23b16f5742eb52f33c39b
+DIST rakudo-2016.02.tar.gz 2691766 SHA256 8ccfbf24f49bf4f5aa0304ffa69abbd90b97dc59f2c65e2384c6b609e3d3f00a SHA512 9fa891a84e882626050772231dee15ad20f1c2d84b5b9ff985964efbff45f18e0a1940dad2cc1fbb8b91f69d9f7f2a3034998819e8ddbf0c380684b326d299ca WHIRLPOOL 2a55ec29df905ec79fee842f84394ac8733d1b116fc90c29a06e8953a77b15bfc193d974a804f99d41ee0b9fce87d4b07ff6e367f03243d08d03f20340fe766e
diff --git a/dev-lang/rakudo/rakudo-2016.02.ebuild b/dev-lang/rakudo/rakudo-2016.02.ebuild
new file mode 100644
index 000000000000..623e8f443bd6
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2016.02.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="test"
+
+RDEPEND="=dev-lang/nqp-${PV}:=[moar]"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.10"
+
+#PATCHES=(${FILESDIR}/${PV})
+
+src_configure() {
+	perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar
+}
+
+src_test() {
+	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
+	default
+}
diff --git a/dev-lang/vala/vala-0.30.1.ebuild b/dev-lang/vala/vala-0.30.1.ebuild
index 0f2884d51e6d..7f1ba9e66c5e 100644
--- a/dev-lang/vala/vala-0.30.1.ebuild
+++ b/dev-lang/vala/vala-0.30.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.30"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild
index 1cd8ea62c200..6bb20a3f2010 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection nls"
 
 # FIXME: yaml is optional with --enable-dep11 but not
diff --git a/dev-libs/atk/atk-2.18.0.ebuild b/dev-libs/atk/atk-2.18.0.ebuild
index 23f3d2bc227a..b9466dfc0a45 100644
--- a/dev-libs/atk/atk-2.18.0.ebuild
+++ b/dev-libs/atk/atk-2.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/btparser/btparser-0.26.ebuild b/dev-libs/btparser/btparser-0.26.ebuild
index 8361f569ae77..82b6fa616b4c 100644
--- a/dev-libs/btparser/btparser-0.26.ebuild
+++ b/dev-libs/btparser/btparser-0.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 1e9d7e76d259..27b8be9696a0 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -2,3 +2,4 @@ DIST efl-1.12.2-lauch_via_logind_or_root_privilege.patch.xz 6276 SHA256 9af4e2cc
 DIST efl-1.12.2.tar.bz2 46808743 SHA256 aa1a6b95de3d92dda819e1245254e3d9c0d68f77d27d89afb1ae3f2244c0bf0c SHA512 8d137a4cd7a11f102b949bfc7047b3be870df6d7ede72765b005914729bf291f59d1f70b69ab7fbbd3328975068aa5ded2f10e556a7d4f7c31aedfcd0d7340e9 WHIRLPOOL 531f81000dafbd88dacd24588a3832a7c2afccf466d070d78d86641b8c0e3e64854c4f9d8dfe46ab0fb84fd6890ac6eb3e8e63d02ef58bedf88c265412f3ddf7
 DIST efl-1.15.2.tar.xz 43176564 SHA256 dd738f19f454621a7fa1fdb4c008457c170989f5f0c535edfed7b6773ae6c2a4 SHA512 bee8d7473bac73545ca02180f42614b7ae6ee0628fe8879b35bbf6809353535df8b1fa01f19ddc81d2ee1ecb5e36512b63c3be4b6b982f4efe8e410aa8ad5c56 WHIRLPOOL 380debdded1989412579cbe17d057512acb8381527c6c50606e6e936ea8bd0f1f1077861ca9afbb5661f404eb658c0dc288d991b204fbca72506d7b89f511df2
 DIST efl-1.16.1.tar.xz 43216556 SHA256 ef01be81598f03aa0e873951cf8280d963fad2b543cdbd3d749916e91825da84 SHA512 85ea5ec7a0d79ce4d9b4308cc262922b0c7b21bef8e415ea774e5e1c7916519a02f9c9526dc2d47c985c055796a81df173a78ea1cb13d2440b87b865473ee38c WHIRLPOOL 03e0398fcc09ebfcbaf5567224f028da273e225d7281553e5ff1997d52b1a3ef2c74423bc58ac2eeb12ac10d20068a6062d870cbc4fdc3b746866af72f5db0db
+DIST efl-1.17.0.tar.xz 43485360 SHA256 c13540bad764d014fea2c079fad8fcca62e5c229994d43aa4eb692d2c9b73afe SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da WHIRLPOOL a9687320a5a61a727dd1ad8d757b260f72165ed54fb311cb0ff0c33590b8fc083aae1850cd8bdc5ae5c7506df119a445457cda9e076193692130c92e01e2d5bf
diff --git a/dev-libs/efl/efl-1.17.0.ebuild b/dev-libs/efl/efl-1.17.0.ebuild
new file mode 100644
index 000000000000..3972324ef27e
--- /dev/null
+++ b/dev-libs/efl/efl-1.17.0.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+elif [[ *"${PV}" == *"_pre"* ]] ; then
+	MY_P=${P%%_*}
+	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment pax-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind wayland webp X xim xine xpm"
+
+REQUIRED_USE="
+	pulseaudio?	( sound )
+	opengl?		( || ( X sdl wayland ) )
+	gles?		( || ( X wayland ) )
+	gles?		( !sdl )
+	gles?		( egl )
+	sdl?		( opengl )
+	wayland?	( egl !opengl gles )
+	xim?		( X )
+"
+
+RDEPEND="
+	drm? (
+		>=dev-libs/libinput-0.8
+		media-libs/mesa[gbm]
+		>=x11-libs/libdrm-2.4
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib )
+	glib? ( dev-libs/glib:2 )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl )
+		)
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	!oldlua? ( >=dev-lang/luajit-2.0.0 )
+	oldlua? ( dev-lang/lua:* )
+	physics? ( >=sci-physics/bullet-2.80 )
+	pixman? ( x11-libs/pixman )
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	scim? ( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl2
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	systemd? ( sys-apps/systemd )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib )
+	valgrind? ( dev-util/valgrind )
+	wayland? (
+		>=dev-libs/wayland-1.8.0
+		>=x11-libs/libxkbcommon-0.3.1
+		media-libs/mesa[gles2,wayland]
+	)
+	webp? ( media-libs/libwebp )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXp
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+
+		gles? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+	)
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+	xpm? ( x11-libs/libXpm )
+
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.20.0
+	sys-libs/zlib
+	virtual/jpeg:0=
+
+	!dev-libs/ecore
+	!dev-libs/edbus
+	!dev-libs/eet
+	!dev-libs/eeze
+	!dev-libs/efreet
+	!dev-libs/eina
+	!dev-libs/eio
+	!dev-libs/embryo
+	!dev-libs/eobj
+	!dev-libs/ephysics
+	!media-libs/edje
+	!media-libs/emotion
+	!media-libs/ethumb
+	!media-libs/evas
+"
+#external lz4 support currently broken because of unstable ABI/API
+#	app-arch/lz4
+
+#soft blockers added above for binpkg users
+#hard blocks are needed for building
+CORE_EFL_CONFLICTS="
+	!!dev-libs/ecore
+	!!dev-libs/edbus
+	!!dev-libs/eet
+	!!dev-libs/eeze
+	!!dev-libs/efreet
+	!!dev-libs/eina
+	!!dev-libs/eio
+	!!dev-libs/embryo
+	!!dev-libs/eobj
+	!!dev-libs/ephysics
+	!!media-libs/edje
+	!!media-libs/emotion
+	!!media-libs/ethumb
+	!!media-libs/evas
+"
+
+DEPEND="
+	${CORE_EFL_CONFLICTS}
+
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	enlightenment_src_prepare
+
+	# Remove stupid sleep command.
+	# Also back out gnu make hack that causes regen of Makefiles.
+	# Delete var setting that causes the build to abort.
+	sed -i \
+		-e '/sleep 10/d' \
+		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
+		-e '/BARF_OK=/s:=.*:=:' \
+		configure || die
+}
+
+src_configure() {
+	if use ssl && use gnutls ; then
+		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
+		einfo "gnutls has been selected for you."
+	fi
+	if use opengl && use gles ; then
+		einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
+		einfo "opengl has been selected for you."
+	fi
+
+	E_ECONF=(
+		--with-profile=$(usex debug debug release)
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-x11=$(usex X xlib none)
+		$(use_with X x)
+		--with-opengl=$(usex opengl full $(usex gles es none))
+		--with-glib=$(usex glib)
+		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
+
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable drm)
+		$(use_enable doc)
+		$(use_enable eet image-loader-eet)
+		$(use_enable egl)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable oldlua lua-old)
+		$(use_enable physics)
+		$(use_enable pixman)
+		$(use_enable pixman pixman-font)
+		$(use_enable pixman pixman-rect)
+		$(use_enable pixman pixman-line)
+		$(use_enable pixman pixman-poly)
+		$(use_enable pixman pixman-image)
+		$(use_enable pixman pixman-image-scale-sample)
+		$(use_enable png image-loader-png)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l2)
+		$(use_enable valgrind)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+		--enable-cserve
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+
+		--disable-tizen
+		--disable-gesture
+		--disable-gstreamer
+		--enable-xinput2
+		--disable-xinput22
+		--disable-multisense
+		--enable-libmount
+
+		# external lz4 support currently broken because of unstable ABI/API
+		#--enable-liblz4
+	)
+
+	enlightenment_src_configure
+}
+
+src_compile() {
+	if host-is-pax && ! use oldlua ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+	enlightenment_src_compile
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+
+	enlightenment_src_install
+}
diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
index 55d75c027b77..aebcc03576eb 100644
--- a/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
+++ b/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs stlport"
 
 RDEPEND="stlport? ( >=dev-libs/STLport-5 )
diff --git a/dev-libs/folks/folks-0.11.2.ebuild b/dev-libs/folks/folks-0.11.2.ebuild
index 4b397f00a82f..2f7627abb895 100644
--- a/dev-libs/folks/folks-0.11.2.ebuild
+++ b/dev-libs/folks/folks-0.11.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
diff --git a/dev-libs/freexl/freexl-1.0.1.ebuild b/dev-libs/freexl/freexl-1.0.1.ebuild
index 8dd6904486e0..db6703f1a25d 100644
--- a/dev-libs/freexl/freexl-1.0.1.ebuild
+++ b/dev-libs/freexl/freexl-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
 IUSE="static-libs"
 
 DEPEND="virtual/libiconv"
diff --git a/dev-libs/gdl/gdl-3.18.0.ebuild b/dev-libs/gdl/gdl-3.18.0.ebuild
index 5d23138334cb..faf931fe8db2 100644
--- a/dev-libs/gdl/gdl-3.18.0.ebuild
+++ b/dev-libs/gdl/gdl-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/glib/glib-2.46.2-r1.ebuild b/dev-libs/glib/glib-2.46.2-r1.ebuild
index 92ad2ffdfbb0..736a3ace76f4 100644
--- a/dev-libs/glib/glib-2.46.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.46.2-r1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	!<dev-util/gdbus-codegen-${PV}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
index a85f562b8b54..53918df6d61f 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://live.gnome.org/GObjectIntrospection/"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
index 9b2328495d66..dbd8a09d0138 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and goi to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/gom/gom-0.3.2.ebuild b/dev-libs/gom/gom-0.3.2.ebuild
index 718bd302f0f0..3ca9916d0644 100644
--- a/dev-libs/gom/gom-0.3.2.ebuild
+++ b/dev-libs/gom/gom-0.3.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection python"
 REQUIRED_IUSE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
 
diff --git a/dev-libs/libcroco/libcroco-0.6.11.ebuild b/dev-libs/libcroco/libcroco-0.6.11.ebuild
index 74ab744bc6b5..7c0bce98f758 100644
--- a/dev-libs/libcroco/libcroco-0.6.11.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.11.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 4a2fcffb8df7..003d4d03671d 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,2 +1,2 @@
-DIST libfilezilla-0.3.0.tar.bz2 372588 SHA256 1ca09836fc166f21cedb71a45e5efc0771650a74d9f611d1fe320f36b53fa42d SHA512 c243cf32bddcee2ce568c08e81deebe7335e6b7f793751972d1b4f7629e3cd70113489c6cbc48c41a9ad0632eb5b7d3cb8ab470d591419b19563dcb9dab3a0dd WHIRLPOOL 66cc027349d31656c885b1063eff482b5a3077fbbd9dbb6e7c03a4880cc654574a8d010ff906ddcd057fef0a440c2093c6627ac7972c9b552b950302e7befae5
 DIST libfilezilla-0.3.1.tar.bz2 372673 SHA256 a4adde9ce2de975e0f8b111705b9f89939466f19edf609efb785a6bf00f050ef SHA512 7f6342e4b3be1c96b76d19b388c3b3f29406dcbf23ec012300f8c35fe1c81fce95725727ff8386d4ae536b8eb59466766d768b6f2ccdef33b69ac7a009cf618f WHIRLPOOL dee1734825225f4ce9d22348e8a83b6c52f153b5889f8895f692554fc7749ceeab87b063f5e464f62360349b58c7957eacf1243ff0b5fe019d596b278ae8c861
+DIST libfilezilla-0.4.0.1.tar.bz2 373987 SHA256 6003689254e9d250bcdefc1414dcc4a0d324fda3d59436a497e249b225f4b1d1 SHA512 6a86cb7794ace650e2d49c01c668d901d669b0bfbde78a4e72528fea40edfc5579cc4d594ea214fd259113b6cd1be5d4808d1465452745cb7a8cf0aa8c66c9c1 WHIRLPOOL 4c98ff899965f3deab2a13f6d64585e7f4be93ac12a21418e35fadee93ce53343898066b8190785813256644ef77d662a78f89345fd418fc351bb59ff6ed2d1c
diff --git a/dev-libs/libfilezilla/libfilezilla-0.3.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.4.0.1.ebuild
similarity index 99%
rename from dev-libs/libfilezilla/libfilezilla-0.3.0.ebuild
rename to dev-libs/libfilezilla/libfilezilla-0.4.0.1.ebuild
index 25ecdfc87b7e..2139f8e583c9 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.3.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.4.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit flag-o-matic
 
 DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
diff --git a/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
index 9906b91b03f3..9c4e1246ad46 100644
--- a/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_IUSE="
 	vala? ( introspection )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # configure checks for gtk:3, but only uses it for demos which are not installed
 RDEPEND="
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild
index c97cbd8cb720..070feb8239f7 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="python ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libgit2/libgit2-0.23.4.ebuild b/dev-libs/libgit2/libgit2-0.23.4.ebuild
index 4299de189188..746b9b921ac6 100644
--- a/dev-libs/libgit2/libgit2-0.23.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~ppc-macos"
+	KEYWORDS="amd64 ~arm ~x86 ~ppc-macos"
 fi
 
 DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgusb/libgusb-0.2.8.ebuild b/dev-libs/libgusb/libgusb-0.2.8.ebuild
index 2e5cef78f761..82d647026274 100644
--- a/dev-libs/libgusb/libgusb-0.2.8.ebuild
+++ b/dev-libs/libgusb/libgusb-0.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="+introspection static-libs vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgweather/libgweather-3.18.1.ebuild b/dev-libs/libgweather/libgweather-3.18.1.ebuild
index 06e47a2a0163..fc6178069628 100644
--- a/dev-libs/libgweather/libgweather-3.18.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.18.1.ebuild
@@ -16,7 +16,7 @@ SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gtk+-3.13.5:3[introspection?]
diff --git a/dev-libs/libinput/libinput-1.1.5.ebuild b/dev-libs/libinput/libinput-1.1.5.ebuild
index c1d8674d12ab..c2225a060262 100644
--- a/dev-libs/libinput/libinput-1.1.5.ebuild
+++ b/dev-libs/libinput/libinput-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index e1da979aa372..f2e35ea40d5e 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,3 +1,4 @@
+DIST libixion-0.11.0.tar.xz 365652 SHA256 97a6e7f2b1fcbff69e76fe4e1df62f1cfcc353820472991e37de00aacb024293 SHA512 ebba456908c74d952256b7ba4b675ebbe0978e1cf39aa2fa03f0f11050fd874cfa8393f92f29cdf70d539bb6a11db94b639f81fdcbf14ee0d4de62236cd85d30 WHIRLPOOL cf0db731cdf6c70555036135eb5c22ad7abc327ff56223604922b7080abb7e31dd56cd9af8e397a4b0c7dac00f5901299a6ee0ff7044915d280b2f754667988e
 DIST libixion-0.7.0.tar.bz2 398089 SHA256 c9594ec93e911b40b26784ccdae47df8ea3a7d9b57bbad876733e4efcedf5581 SHA512 bda96a9cefb4bd842cd399a74c2fb5791d2a1d1d06d07106e1a121dc0bc02c00bef371b480ab1a7f922d5292c4d94fa8f7faaa2c6cd7596f2bc08b6ddfc929f5 WHIRLPOOL 0881a4b350eb6e8dc30ec166630cf46f85af07f41010b51b1b359787641d7f742ae10f1d4b1b3e438460bdb72468f43158c5baf1da95a0b70ed9d380c230f7d3
 DIST libixion-0.9.0.tar.xz 351388 SHA256 2112b4304667c4c2cdb8f3d331cc4ba696ea581db7d228b5b06ea2559e7531a5 SHA512 da6ca9e79841f1f529328e39a2977d95a261ddaaf4a254bfc46de004d52d4b1e8fc0c8c1cbeb3e8ee18e9a5663b046cf1d3f232f31bdd83db75a766be654f49b WHIRLPOOL f35087fce0a0e53650b988b36ecde8378aa75d2a4b769f6046dce544b9fe89a0025c82a6ab2564b5a12c813e0726875c088d5cc37cfcad055d79d2c5563d53af
 DIST libixion-0.9.1.tar.xz 356500 SHA256 77e35c163cd27657b83626a6da26c3b90f37ba9089d00aa25f384a9ac4b4e3a1 SHA512 074318c6db01ec13f6cbdfb8d7d04aede9f20cac4c23476b570a37638b0e68170aabf977520b94dfc2dce079314109c2e70d64376f9f314890d4d60854458c03 WHIRLPOOL ed79f0ed5705f8f8c5a24603fa4386b8822b477a21896d13eaf5fbe52d0f12fbf451f68de49314d8736160f82895047ba4d387431f989683553316d523bb0ce4
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
index a4e7239568a2..df945abc3928 100644
--- a/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-optional.patch
@@ -1,34 +1,48 @@
-commit 59c360c9fe438a2805d65decc6c7889bc99a7747
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun May 31 10:14:17 2015 +0200
-
-    python: Make it optional
-    
-    python bindings are built unless disabled
-
-diff --git a/configure.ac b/configure.ac
-index 03f6120..1c7d8b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,6 @@ AC_PREREQ([2.63])
+--- a/configure.ac	2016-02-06 17:08:05.505990463 +0100
++++ b/configure.ac	2016-02-06 17:08:42.316530268 +0100
+@@ -15,18 +15,13 @@
  AC_INIT([libixion], [ixion_version])
  AC_CONFIG_HEADERS([config.h])
  AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2 dist-xz])
 -AM_PATH_PYTHON(2.7.0)
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
  
- AC_ARG_WITH(hash-container-compat,
-@@ -28,6 +27,9 @@ AC_ARG_WITH(mdds-include-path,
-     AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.])
- ,)
- 
+-AC_ARG_WITH(hash-container-compat,
+-[
+-  --with-hash-container-compat use std::hash_foo instead of boost::unordered_foo
+-],
+-,with_hash_container_compat=no)
+-
+-AC_ARG_WITH(mdds-include-path,
+-    AS_HELP_STRING([--with-mdds-include-path], [specify include path for mdds headers.])
+-,)
 +AC_ARG_ENABLE([python],
-+    AS_HELP_STRING([--disable-python], [Disable python bindings]))
-+
++    [AS_HELP_STRING([--disable-python], [Disable python bindings])],
++    [enable_python="$enableval"],
++    [enable_python=yes]
++)
+ 
  IXION_API_VERSION=ixion_api_version
  IXION_MAJOR_VERSION=ixion_major_version
- IXION_MINOR_VERSION=ixion_minor_version
-@@ -82,7 +84,11 @@ fi
+@@ -66,23 +61,19 @@
+ AC_FUNC_STRTOD
+ AC_CHECK_FUNCS([gettimeofday])
+ 
+-CPPFLAGS="$CPPFLAGS -D_REENTRANT -DMDDS_HASH_CONTAINER_BOOST"
++CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+ 
+-AC_MSG_CHECKING([whether to turn on hash container compatibility])
+-if test "z$with_hash_container_compat" = "zno"; then
+-    AC_MSG_RESULT([no])
+-    BOOST_REQUIRE([1.36])
+-    BOOST_UNORDERED
+-else
+-    AC_MSG_RESULT([yes])
+-    DEFINES="$DEFINES -D_IXION_HASH_CONTAINER_COMPAT"
+-fi
++BOOST_REQUIRE([1.36])
+ 
+ # Check for mdds.
  PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0])
  
  # Check for python.
@@ -37,20 +51,32 @@ index 03f6120..1c7d8b2 100644
 +    AM_PATH_PYTHON(2.7.0)
 +    PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1])
 +])
-+AM_CONDITIONAL([PYTHON], [test "x$enable_python" != "xno"])
++AM_CONDITIONAL([BUILD_PYTHON], [test "x$enable_python" != "xno"])
  
  CPPFLAGS="$CPPFLAGS -g -Os -fvisibility=hidden"
  
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6e138a4..cd912ab 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,7 @@
--SUBDIRS = libixion python
-+SUBDIRS = libixion
-+if PYTHON
-+	SUBDIRS += python
-+endif
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include $(MDDS_CFLAGS)
+@@ -101,3 +92,10 @@
+                  src/libixion/constants.inl
+                  src/python/Makefile])
+ AC_OUTPUT
++
++AC_MSG_NOTICE([
++==============================================================================
++Build configuration:
++	python:               $enable_python
++==============================================================================
++])
+--- a/src/python/Makefile.am	2016-02-06 17:08:12.138907540 +0100
++++ b/src/python/Makefile.am	2016-02-06 17:08:38.034583800 +0100
+@@ -1,3 +1,5 @@
++if BUILD_PYTHON
++
+ pyexec_LTLIBRARIES = ixion.la
+ ixion_la_SOURCES = \
+ 	document.hpp \
+@@ -16,3 +18,5 @@
  
+ AM_TESTS_ENVIRONMENT = PYTHONPATH=.libs$${PYTHONPATH:+:$${PYTHONPATH}}; export PYTHONPATH;
+ TESTS = ../../test/ixion-python-test.py
++
++endif
diff --git a/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch
new file mode 100644
index 000000000000..1a62bbc9b55b
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.9.1-python-symbol.patch
@@ -0,0 +1,13 @@
+diff --git a/src/python/Makefile.am b/src/python/Makefile.am
+index 0dfae54..094e0cf 100644
+--- a/src/python/Makefile.am
++++ b/src/python/Makefile.am
+@@ -10,7 +10,7 @@ ixion_la_SOURCES = \
+ 	sheet.hpp \
+ 	sheet.cpp
+ 
+-ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex initixion
++ixion_la_LDFLAGS = -module -avoid-version -export-symbols-regex PyInit_ixion
+ ixion_la_CPPFLAGS = -I$(top_srcdir)/include $(PYTHON_CFLAGS) $(MDDS_CFLAGS)
+ ixion_la_LIBADD = \
+ 	../libixion/libixion-@IXION_API_VERSION@.la \
diff --git a/dev-libs/libixion/libixion-0.11.0.ebuild b/dev-libs/libixion/libixion-0.11.0.ebuild
new file mode 100644
index 000000000000..0d63dd71fb96
--- /dev/null
+++ b/dev-libs/libixion/libixion-0.11.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
+
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+inherit eutils python-single-r1 ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="General purpose formula parser & interpreter"
+HOMEPAGE="https://gitlab.com/ixion/ixion"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/0.11" # based on SONAME of libixion.so
+[[ ${PV} == 9999 ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="python static-libs"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-util/mdds:1=
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/dev-libs/libixion/libixion-0.9.0.ebuild b/dev-libs/libixion/libixion-0.9.0.ebuild
index f36ed2573dbb..59b884225db9 100644
--- a/dev-libs/libixion/libixion-0.9.0.ebuild
+++ b/dev-libs/libixion/libixion-0.9.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libixion/libixion-0.9.1.ebuild b/dev-libs/libixion/libixion-0.9.1.ebuild
index ff9dd6d029b8..9c993be33bd9 100644
--- a/dev-libs/libixion/libixion-0.9.1.ebuild
+++ b/dev-libs/libixion/libixion-0.9.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$
 
@@ -27,7 +27,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.12.0:=
+	>=dev-util/mdds-0.12.0:0=
 "
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -37,8 +37,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.1-typo.patch"
-	epatch "${FILESDIR}/${PN}-0.9.1-python-optional.patch"
+	epatch "${FILESDIR}/${PN}-0.9.1-typo.patch" \
+		"${FILESDIR}/${PN}-0.9.1-python-optional.patch" \
+		"${FILESDIR}/${PN}-0.9.1-python-symbol.patch"
 	eautoreconf
 }
 
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 676202bf741d..0a1ad4313631 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-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
 
 EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
 
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
 inherit eutils python-single-r1 ${GITECLASS}
@@ -17,7 +17,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
 [[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/ixion/src/${P}.tar.xz"
 
 LICENSE="MIT"
-SLOT="0/0.12"
+SLOT="0/0.11" # based on SONAME of libixion.so
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="python static-libs"
@@ -27,7 +27,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.12.0:=
+	dev-util/mdds:1=
 "
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -37,6 +37,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/dev-libs/libixion/metadata.xml b/dev-libs/libixion/metadata.xml
index 13ce236ee519..4fc2ac069dc2 100644
--- a/dev-libs/libixion/metadata.xml
+++ b/dev-libs/libixion/metadata.xml
@@ -5,4 +5,7 @@
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">ixion/ixion</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild b/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..3612205fec10
--- /dev/null
+++ b/dev-libs/liborcus/liborcus-0.7.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://gitlab.com/orcus/orcus.git"
+
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+inherit eutils ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="Standalone file import filter library for spreadsheet documents"
+HOMEPAGE="https://gitlab.com/orcus/orcus"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+IUSE="+spreadsheet-model static-libs tools"
+
+RDEPEND="
+	>=dev-libs/boost-1.51.0:=
+	sys-libs/zlib:=
+	spreadsheet-model? ( =dev-libs/libixion-0.9*:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/mdds-0.8.1:0
+"
+
+src_prepare() {
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable spreadsheet-model) \
+		$(use_enable static-libs static) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+}
diff --git a/dev-libs/liborcus/liborcus-0.7.1.ebuild b/dev-libs/liborcus/liborcus-0.7.1.ebuild
index 7c68d4c97fbe..87cbf3624b7b 100644
--- a/dev-libs/liborcus/liborcus-0.7.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.7.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$
 
@@ -23,11 +23,11 @@ IUSE="static-libs"
 
 RDEPEND="
 	>=dev-libs/boost-1.51.0:=
-	>=dev-libs/libixion-0.9:=
+	=dev-libs/libixion-0.9*:=
 	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.8.1
+	>=dev-util/mdds-0.8.1:0
 "
 
 src_prepare() {
diff --git a/dev-libs/liborcus/liborcus-0.9.2.ebuild b/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild
similarity index 70%
rename from dev-libs/liborcus/liborcus-0.9.2.ebuild
rename to dev-libs/liborcus/liborcus-0.9.2-r1.ebuild
index 6668627e3640..8a6c9f20feb3 100644
--- a/dev-libs/liborcus/liborcus-0.9.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.9.2-r1.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 
@@ -15,31 +15,34 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 [[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz"
 
 LICENSE="MIT"
-SLOT="0/0.10"
+SLOT="0/0.10" # based on SONAME of liborcus.so
 
 #[[ ${PV} == 9999 ]] || \
 #KEYWORDS="~amd64 ~arm ~ppc ~x86"
 KEYWORDS=""
 
-IUSE="static-libs"
+IUSE="+spreadsheet-model static-libs tools"
 
 RDEPEND="
 	>=dev-libs/boost-1.51.0:=
-	=dev-libs/libixion-0.9*:=
 	sys-libs/zlib:=
+	spreadsheet-model? ( =dev-libs/libixion-0.9*:= )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.11
+	>=dev-util/mdds-0.11:0
 "
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-werror \
-		$(use_enable static-libs static)
+		$(use_enable spreadsheet-model) \
+		$(use_enable static-libs static) \
+		$(use_with tools)
 }
 
 src_install() {
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index e175a1e15171..64a4c246dcdb 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -1,13 +1,15 @@
-# 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
 
 EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 
+PYTHON_COMPAT=( python{3_4,3_5} )
+
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
-inherit eutils ${GITECLASS}
+inherit eutils python-single-r1 ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -15,28 +17,39 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 [[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz"
 
 LICENSE="MIT"
-SLOT="0/0.10"
+SLOT="0/0.11" # based on SONAME of liborcus.so
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="static-libs"
+IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
 	>=dev-libs/boost-1.51.0:=
-	=dev-libs/libixion-0.9*:=
 	sys-libs/zlib:=
+	python? ( ${PYTHON_DEPS} )
+	spreadsheet-model? ( =dev-libs/libixion-9999:= )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/mdds-0.11
+	dev-util/mdds:1
 "
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-werror \
-		$(use_enable static-libs static)
+		$(use_enable python) \
+		$(use_enable spreadsheet-model) \
+		$(use_enable static-libs static) \
+		$(use_with tools)
 }
 
 src_install() {
diff --git a/dev-libs/liborcus/metadata.xml b/dev-libs/liborcus/metadata.xml
index 13ce236ee519..76fa89e1b408 100644
--- a/dev-libs/liborcus/metadata.xml
+++ b/dev-libs/liborcus/metadata.xml
@@ -5,4 +5,11 @@
 		<email>office@gentoo.org</email>
 		<name>Gentoo Office project</name>
 	</maintainer>
+	<use>
+		<flag name="spreadsheet-model">Enable the spreadsheet model implementation</flag>
+		<flag name="tools">Build miscellaneous tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">orcus/orcus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libpeas/libpeas-1.16.0.ebuild b/dev-libs/libpeas/libpeas-1.16.0.ebuild
index 9a447442a1ad..04128cdd531b 100644
--- a/dev-libs/libpeas/libpeas-1.16.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.16.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="+gtk glade jit lua +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
 
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index 829840f115ea..e98fab1c9b99 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit eutils multilib-minimal
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	eapply_user
 	[[ ${PV} = 9999 ]] && eautoreconf
 }
 
diff --git a/dev-libs/libsigc++/libsigc++-2.6.2.ebuild b/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
index 04dbd1ad7703..d889754b3e4a 100644
--- a/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libxml2/libxml2-2.9.3.ebuild b/dev-libs/libxml2/libxml2-2.9.3.ebuild
index 85dc26a1aac6..34e9b7105a24 100644
--- a/dev-libs/libxml2/libxml2-2.9.3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/npth/npth-1.2.ebuild b/dev-libs/npth/npth-1.2.ebuild
index d9dc362728ce..a9f559ae4ae9 100644
--- a/dev-libs/npth/npth-1.2.ebuild
+++ b/dev-libs/npth/npth-1.2.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$
 
@@ -11,5 +11,5 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
diff --git a/dev-libs/smack/smack-0.5.0.ebuild b/dev-libs/smack/smack-0.5.0.ebuild
index f4dc7f8d4aec..0915ebccbd1f 100644
--- a/dev-libs/smack/smack-0.5.0.ebuild
+++ b/dev-libs/smack/smack-0.5.0.ebuild
@@ -14,5 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="app-arch/snappy"
+DEPEND="app-arch/snappy
+	dev-libs/boost"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
index c30f438fcd1c..890d4e4184a4 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
 LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt +introspection +quvi test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/dev-libs/urdfdom_headers/Manifest b/dev-libs/urdfdom_headers/Manifest
index cd1f16a78d44..0338398d8102 100644
--- a/dev-libs/urdfdom_headers/Manifest
+++ b/dev-libs/urdfdom_headers/Manifest
@@ -1,2 +1,3 @@
 DIST urdfdom_headers-0.3.0.tar.gz 9931 SHA256 f059350cd85fc3b8394ed0c3bd0d4b8d14fa9c8edd09c3ee01881b4711843087 SHA512 249ea2a2cb8196eb14e005f32a3376585a5a25d599ff041b562500e2e9f17a988a8cd0dfd575853e1cfc7ca736882e856998718b702b8d0be0fc4a011d8d9dd9 WHIRLPOOL 9f7919fb1b56eedfafa8b474e2c990349f070cee10d7e48f66d5e02246583915804d5ab0c60ea98a3013b8adaabb3e0f33e814a0d79e86c2e4ced0a06e2115d8
 DIST urdfdom_headers-0.4.0.tar.gz 11488 SHA256 01fec111f91805eb5bcbbee56b5da7413de7a7485ad4c63ea51614ebdfc25eca SHA512 c04807d52a252c5def9d1a8dbc23dc694e432b7f777607a79de1aa74d66a20c19b5cce911051de734d21e08daa925ceaf4272a6504bf39bc2289eeda60e7f5e6 WHIRLPOOL 9fa094be524a0f7c9e76d2946e9321effd3058b11221c4b8a389ab30bb18ac63f2336b247c3d4563ddcd92e48b9f5d6add7805ae57ee9f0d726d8a4b87e58e20
+DIST urdfdom_headers-0.4.1.tar.gz 11473 SHA256 e210f9234af47bfc9fa4bb17d004fb3eac4513dcdfe639fb7b1c2db6408c8cd8 SHA512 cf123fb842159fbfae1083a770b6229063c6444712c686e7e461020c8efcd43e076c6db1d2035a26e5842a66dc17d4d6d2416c7c01772c890a9b75f50977b7f2 WHIRLPOOL 92a4239c532e32df1c7e7a264759b423ed2da55d1c8e5105933bd2f4b46f6c0cf31b9dfe1f7aeedc72b77bccc20341976a01d587940c6285900d5dc427b07e85
diff --git a/dev-libs/urdfdom_headers/urdfdom_headers-0.4.1.ebuild b/dev-libs/urdfdom_headers/urdfdom_headers-0.4.1.ebuild
new file mode 100644
index 000000000000..956b287f7714
--- /dev/null
+++ b/dev-libs/urdfdom_headers/urdfdom_headers-0.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/urdfdom_headers"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/ros/urdfdom_headers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="URDF (U-Robot Description Format) headers"
+HOMEPAGE="http://ros.org/wiki/urdf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-libs/vala-common/vala-common-0.30.1.ebuild b/dev-libs/vala-common/vala-common-0.30.1.ebuild
index 05615377031f..d5c3a73b303a 100644
--- a/dev-libs/vala-common/vala-common-0.30.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.30.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild
index d8e8d0df3909..1bd98ab5eb2b 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 #IUSE="java lua mono perl php python ruby tcl"
 #REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
 IUSE="java lua perl php python ruby tcl"
diff --git a/dev-libs/xapian/xapian-1.2.22.ebuild b/dev-libs/xapian/xapian-1.2.22.ebuild
index f328a48bff9b..6291028e5476 100644
--- a/dev-libs/xapian/xapian-1.2.22.ebuild
+++ b/dev-libs/xapian/xapian-1.2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-ml/macaque/Manifest b/dev-ml/macaque/Manifest
index 9117b8493cfd..f1c7373877fb 100644
--- a/dev-ml/macaque/Manifest
+++ b/dev-ml/macaque/Manifest
@@ -1 +1,2 @@
 DIST macaque-0.7.2.tar.gz 106245 SHA256 8b20335419cb640f9c86eced851a7349351b0825a955043465a41de1d72ec715 SHA512 9823052350083d8042db11eb103cbc71ba85580884a4dcf82c5fb011e59875595ad49b5a6c800f1f6cf5ae86aa5659bab81b623db58bcf1290e18900112d3c5c WHIRLPOOL 11fa5be1189edbadc37348e5b285e998adb4aec58481e0c0eb8bf5ff35e645c155c60cd43239671b1e1d9f66d132fda1755f9f6eec7ed3dcfe606796fdab0c05
+DIST macaque-0.7.4.tar.gz 64896 SHA256 16629ee969aa02d7e0b01b98d6b0c9f19e32b91672c2ebc432d30ee522ae5352 SHA512 db664226e58ad3db2dc00e920dcc757242b0bcc8d1b6406e6743afe6cdbe789546af131a00c07a5e2e63ed39b9017c2d8e2f5bbce63a741df58bf14633aae89a WHIRLPOOL 032582ed6ca98f840ba7de57dc838c6d0702239b15a83a52b7b6551b90a86e367927ec8005d2adf1053c646a1d6bd90744c250c2bb58619a2a0ad0b7d1e94937
diff --git a/dev-ml/macaque/macaque-0.7.4.ebuild b/dev-ml/macaque/macaque-0.7.4.ebuild
new file mode 100644
index 000000000000..19d2258ef8c6
--- /dev/null
+++ b/dev-ml/macaque/macaque-0.7.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="DSL for SQL Queries in Caml"
+HOMEPAGE="http://ocsigen.org/macaque/"
+SRC_URI="https://github.com/ocsigen/macaque/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-ml/pgocaml-2.1:=
+	dev-ml/camlp4:="
+RDEPEND="${DEPEND}"
+DOCS=( Changelog README.md )
+OASIS_SETUP_COMMAND="./setup.exe"
+
+src_configure() {
+	emake setup.exe
+	oasis_src_configure
+}
diff --git a/dev-ml/ocaml-cstruct/Manifest b/dev-ml/ocaml-cstruct/Manifest
index 38ea71ffcff6..104f53acba35 100644
--- a/dev-ml/ocaml-cstruct/Manifest
+++ b/dev-ml/ocaml-cstruct/Manifest
@@ -1,2 +1,3 @@
 DIST ocaml-cstruct-1.7.1.tar.gz 245894 SHA256 7869d096fe7c6231bbceefe3b2205417b28b6c10f4174b7e2cfdfa46956eaaa5 SHA512 67dd276ab2f895ef80cc7ba5b48d51bcfcf52ac49aa29cd4b17aa00be109198347a50229b81fbe506d831ace753d72f3b4bb80f19e8e57fa29d9ba65da472f19 WHIRLPOOL 8145930a1dcadbcf48c1da0dcba10a45f3d52c8ae2565aee7e609bd3eeb5eead9cee9ef423332a580ab77ceabb2f301917226d1a73e1b7f6efc7a3096c4112d6
 DIST ocaml-cstruct-1.8.0.tar.gz 250696 SHA256 e1635072283ae5db7889966ce92e916749bcd192012a0c46285827beba1263d7 SHA512 38ea6301b48603f8b63c73a7aa42312d25bbd16fb8524e1de2b69a54e45e9e1c1326201e19fcf2953d2719607139c903d76296a32fb7058998c079ac112adc9c WHIRLPOOL 6fdabfc1143331662757826de11c62c3947fb59155ba68e866a2f9939963deacd52d5832417997833deff9a9ff902675d266a98b41e0d2cf9f29c4d4c628601e
+DIST ocaml-cstruct-1.9.0.tar.gz 254162 SHA256 2d175bf1e2cdc5ca43cb30bd3fa507beee2f18b2cbecae801ab6ffaecde16c9c SHA512 fad3788c0888599a3171d4062b9d9f4c539c0cbb1d8b6d4f6be2f3456ffe235444def4e619a94ca75336cf555b5133e6e60edc07a03dc0abdd772acf9371b666 WHIRLPOOL 99984c32625d9dbf452a7191f4103228bedbd7eee23bfb1eee7834022a023dee1582fca9704fcbe09ed37424ca7d684c482426d3b30b5f1dc66cc55b78769532
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-1.9.0.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.9.0.ebuild
new file mode 100644
index 000000000000..0589e77428ac
--- /dev/null
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.9.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Map OCaml arrays onto C-like structs"
+HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +camlp4 +lwt +ppx"
+
+RDEPEND="
+	async? ( dev-ml/async:= )
+	camlp4? ( dev-ml/camlp4:= )
+	lwt? ( dev-ml/lwt:= )
+	ppx? ( dev-ml/ppx_tools:= )
+	>=dev-lang/ocaml-4.01:=
+	dev-ml/ocplib-endian:=
+	dev-ml/sexplib:=
+	dev-ml/type-conv:=
+"
+DEPEND="
+	test? ( dev-ml/ounit )
+	${RDEPEND}
+"
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable lwt)
+		$(use_enable camlp4)
+		$(use_enable async)
+		$(use_enable ppx)
+		--enable-unix
+	" oasis_src_configure
+}
+
+DOCS=( CHANGES README.md TODO.md )
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index 88844f37a948..79985b88ff76 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -1 +1,2 @@
 DIST ocaml-ctypes-0.4.1.tar.gz 162601 SHA256 74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5 SHA512 8155ffe16a58d5714ceb602afa5531c93526defca39a16047328ac06d2c7c7f52b768b18170391f467e1f6919c69275734faf85d27315e11b8bbefcb1bc8afa9 WHIRLPOOL d8d0ef24e0b6c40f50fddf38fed7238cf95573909d2809cc2ab5c1b9b3dab333210e1ce99cf805804576a79d08d819e2ecdee7b4a6a9e13efb13e7b9f88ad802
+DIST ocaml-ctypes-0.4.2.tar.gz 162968 SHA256 704efcbf3b99c180855ad4faed0dd7cec4f2384f9b8963b572329697be8cbae4 SHA512 78e51a4ea35efd6d854b81c65d3e224175927a3c87b9b665d173cefeb3f424e1ed8fc8dfbbb4ce33b4bc43163ecf647ba9b502e69c82eb05ddcde66b8d6c99e4 WHIRLPOOL 124c6f91ae1ae980994f8cca483a2090c60b62864abe8d4b9aac725b2131f331d385a6a1e5b7685e4f61ac4e3e53cb22ac0cad9b32ebefa444d2ef00e15f7caa
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.2.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.2.ebuild
new file mode 100644
index 000000000000..8ebc7be8e1da
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	virtual/libffi
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/pgocaml/Manifest b/dev-ml/pgocaml/Manifest
index 80c64cdafee7..97c8a308c5fa 100644
--- a/dev-ml/pgocaml/Manifest
+++ b/dev-ml/pgocaml/Manifest
@@ -1 +1,2 @@
 DIST pgocaml-2.2.tgz 88613 SHA256 3027ca823f9f3db24475bd36e5628ee259605d72048d889be3b7e32c3e850d74 SHA512 1358e377d46aeb8fa00f44ba47dcc61097919584accc96264ae751cd2d6b8380dd2135109d5f6bf7963f3b448ee59046210c6335a3750deed4ad0ce5fc0a9d8d WHIRLPOOL 53da87c02670d493ff0dd12c467d69bac630aa9fe5141be074f328722c305611ad951d14fafe941961dd40d4b6af012ef4e3a305bb6df96734c13f01473c4520
+DIST pgocaml-2.3.tgz 90383 SHA256 ef8ec253a752eb31e535d845440185b95c4de31db8c5c955e79638b669af9ea2 SHA512 f42ca8ccf31f9e03cfa9f81a9cd19c2a6010c33f5a578e76924683fd10ab4acf2727b09b71c5a8f200bc39765a5d876a289976fea367b49ae54335c007fd3ff7 WHIRLPOOL 48a8adb944db6bce29f818f287d47b35d0b776f3eb5bb68e0e835a4ac451405d46bbd3fcdc14c1ee9542f9b0afecd5e7b98a2f74d32fdbb7efe61c232414a0f7
diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
index 76bbff93b8c7..5916b25a8911 100644
--- a/dev-ml/pgocaml/metadata.xml
+++ b/dev-ml/pgocaml/metadata.xml
@@ -5,4 +5,7 @@
 			<email>ml@gentoo.org</email>
 			<name>Gentoo ML Project</name>
 		</maintainer>
+  <use>
+	<flag name="camlp4">Enable PG'Ocaml syntax extension.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-ml/pgocaml/pgocaml-2.3.ebuild b/dev-ml/pgocaml/pgocaml-2.3.ebuild
new file mode 100644
index 000000000000..c9e22b4b42ac
--- /dev/null
+++ b/dev-ml/pgocaml/pgocaml-2.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="PG'OCaml is a set of OCaml bindings for the PostgreSQL database"
+HOMEPAGE="http://pgocaml.forge.ocamlcore.org/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1597/${P}.tgz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="camlp4 doc"
+
+DEPEND="dev-ml/calendar:=
+	dev-ml/csv:=
+	dev-ml/pcre-ocaml:=
+	camlp4? ( dev-ml/camlp4:= )"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "CHANGELOG.txt"
+	"doc/BUGS.txt" "doc/CONTRIBUTORS.txt"
+	"doc/HOW_IT_WORKS.txt" "doc/PROFILING.txt"
+	)
+
+src_configure() {
+	oasis_configure_opts="$(use_enable camlp4 p4)" oasis_src_configure
+}
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index d3cccdee6dee..de71dd1260bf 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1 +1,2 @@
 DIST yojson-1.3.0.tar.gz 26610 SHA256 80e26e6d902c57bbacf44467f2a5cc30e4e189260093c66a3269fb1b1cc37094 SHA512 65e2d5bb7649cad3d395ec8fead11b18fd0ca5e59e87194a39a77561bcdaa04cecdc71f0da32ac268a36c0e7b21f56e9f40a08610f84cf7f81d0da20daf90fc0 WHIRLPOOL ed5ba5a5c397d47616282272573f9940d02035698a45dc7bc377c1fb2918d4a72fc789a4332ff7c09113d6bdcb223e2321f46f21f9576ff85197825bdc661d0d
+DIST yojson-1.3.1.tar.gz 26725 SHA256 ea97f150bb8270730165f7727518aa533c784b84f17016d339060161250124b8 SHA512 f0fb6dad88f75d279a4341384238d4b6fd63c7b34a5a7892fbf278604a4011ea744c355377246e92595696fc5a5298968802c40a12a3ddcd89412ee1ce1e1402 WHIRLPOOL 558cc3258ee4e27a4507c1383d5e2fc6542d2f8178430d73020b37184624df2879a56cee30cc9844d0531f2f1199613591500cf888f606b1788dd3c166e0b7dc
diff --git a/dev-ml/yojson/yojson-1.3.1.ebuild b/dev-ml/yojson/yojson-1.3.1.ebuild
new file mode 100644
index 000000000000..cab42fda852b
--- /dev/null
+++ b/dev-ml/yojson/yojson-1.3.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
+HOMEPAGE="http://mjambon.com/yojson.html"
+SRC_URI="https://github.com/mjambon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
+	dev-ml/easy-format:=[ocamlopt]
+	dev-ml/biniou:=[ocamlopt]
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo
+"
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	findlib_src_install BINDIR="${ED}"/usr/bin
+	dodoc README.md Changes
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0-r1.ebuild
similarity index 87%
rename from dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild
rename to dev-perl/Data-FormValidator/Data-FormValidator-4.810.0-r1.ebuild
index 015acb4e75ba..bab1c2ac3387 100644
--- a/dev-perl/Data-FormValidator/Data-FormValidator-4.810.0.ebuild
+++ b/dev-perl/Data-FormValidator/Data-FormValidator-4.810.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$
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND="dev-perl/ImageSize
+RDEPEND="dev-perl/Image-Size
 	>=dev-perl/Date-Calc-5.0
 	>=dev-perl/File-MMagic-1.17
 	>=dev-perl/MIME-Types-1.005
diff --git a/dev-perl/HTML-Quoted/HTML-Quoted-0.30.0-r1.ebuild b/dev-perl/HTML-Quoted/HTML-Quoted-0.30.0-r1.ebuild
deleted file mode 100644
index 95d49c844633..000000000000
--- a/dev-perl/HTML-Quoted/HTML-Quoted-0.30.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RUZ
-MODULE_VERSION=0.03
-inherit perl-module
-
-DESCRIPTION="Extract structure of quoted HTML mail message"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/HTML-Parser-3.0.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
-"
-
-SRC_TEST=do
diff --git a/dev-perl/HTML-Quoted/Manifest b/dev-perl/HTML-Quoted/Manifest
index 04b072da651b..9090e7bdd7af 100644
--- a/dev-perl/HTML-Quoted/Manifest
+++ b/dev-perl/HTML-Quoted/Manifest
@@ -1,2 +1 @@
-DIST HTML-Quoted-0.03.tar.gz 20836 SHA256 ec5eedcbbbf8fd0a91e95c2bf35fe6efe0e1faa4f64f18063b4c240c29d08175 SHA512 7d471740cf71483180088c36b9ca867d8cd5e242e0fbc0b6a1060f0ab7b420131a65654dd941ed6047d5944f954990cbeb8d323a6a5a4bd61add91dc99db7bba WHIRLPOOL 721e05cb1cf33b702dfdced3c725214494d5b4ab12c09f02231a3a179829c49a7a0e678f42623f70c16508630617ba6199e10658e72df4f95a2c66862fe62b0f
 DIST HTML-Quoted-0.04.tar.gz 23106 SHA256 8b41f313fdc1812f02f6f6c37d58f212c84fdcf7827f7fd4b030907f39dc650c SHA512 a13fb07d683741ec32679780d7183c849c534fb79e2b5f5613f9142e2b877938712d8bf20bb1e540ad5f4532cd7f2fcbf42bc3be5e931d7a4a2ae12bd0af0cc0 WHIRLPOOL 1af8d20e045be9f6296338eadaaac7ae9c839a35fa9b78c11cb56bfbe96e6210d05ae51dd5b9326b671205151f5b2da53438a3bb4b38525d63c6cb65f4a64e5b
diff --git a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.150.0-r1.ebuild b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.150.0-r1.ebuild
deleted file mode 100644
index 128e22a788ed..000000000000
--- a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.150.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=OVID
-MODULE_VERSION=3.15
-inherit perl-module
-
-DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions"
-
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-perl/HTML-Parser-3.25"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	virtual/perl-Test-Simple
-	dev-perl/Sub-Override"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild
index 2d4766d05a0b..ad8dd04c138e 100644
--- a/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild
+++ b/dev-perl/HTML-TokeParser-Simple/HTML-TokeParser-Simple-3.160.0-r1.ebuild
@@ -8,7 +8,7 @@ MODULE_AUTHOR=OVID
 MODULE_VERSION=3.16
 inherit perl-module
 
-DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions"
+DESCRIPTION="Easy to use HTML::TokeParser interface"
 
 SLOT="0"
 KEYWORDS="amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
diff --git a/dev-perl/HTML-TokeParser-Simple/Manifest b/dev-perl/HTML-TokeParser-Simple/Manifest
index 9fb21a7bf54c..daa88b31068e 100644
--- a/dev-perl/HTML-TokeParser-Simple/Manifest
+++ b/dev-perl/HTML-TokeParser-Simple/Manifest
@@ -1,2 +1 @@
-DIST HTML-TokeParser-Simple-3.15.tar.gz 16302 SHA256 ab006c808f4607ecdeed1d54ba997167281d97cc7d1dc968d0971f7802e72146 SHA512 917dd3f33260981b3c52bda0f1791ef41ff4084eb3cfcb1f8bbd25d0b7cfd65c41bcd1b4e48f7098dc7e4291051c45a4cfd87190e1e2e4aab16958a65c0ea61c WHIRLPOOL b69f66d528b2a64f3a3b9dde98235c793c58c880e42c84b0962c250d32c97d9c3b87a69c3f547d8c0a84ec0fc6ee452a6ec35d76a1c0ef26a76ded741ddfb4f7
 DIST HTML-TokeParser-Simple-3.16.tar.gz 19952 SHA256 ed11135c6839e6e0eaf96952e6ac353a2f22ebb40a721659671e5d2dcc0e4a9d SHA512 d13487cc86af7c7e90aa5b9006b989faedd6a8e06279aaf6a0f13bad613a1672b3fa280bf8f369236033104d3c092e62efa177595cc5e5c74cb966e0b12a205a WHIRLPOOL 75fdfd365a560741f62bd1ce00047c4ad034aa2f935f0c0fbc75f199bac09201694782ead2a75a4290bffbaafce4c2bd91db27e584b416bd63f9d3f94a41dbea
diff --git a/dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild b/dev-perl/Image-Info/Image-Info-1.340.0.ebuild
similarity index 86%
rename from dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild
rename to dev-perl/Image-Info/Image-Info-1.340.0.ebuild
index 03bc559ec397..c93c2e10fec7 100644
--- a/dev-perl/ImageInfo/ImageInfo-1.340.0.ebuild
+++ b/dev-perl/Image-Info/Image-Info-1.340.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-MY_PN=Image-Info
 MODULE_AUTHOR=SREZIC
 MODULE_VERSION=1.34
 inherit perl-module
diff --git a/dev-perl/ImageInfo/ImageInfo-1.360.0.ebuild b/dev-perl/Image-Info/Image-Info-1.360.0.ebuild
similarity index 85%
rename from dev-perl/ImageInfo/ImageInfo-1.360.0.ebuild
rename to dev-perl/Image-Info/Image-Info-1.360.0.ebuild
index e2b26231e90a..338422ae9726 100644
--- a/dev-perl/ImageInfo/ImageInfo-1.360.0.ebuild
+++ b/dev-perl/Image-Info/Image-Info-1.360.0.ebuild
@@ -1,10 +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
 
-MY_PN=Image-Info
 MODULE_AUTHOR=SREZIC
 MODULE_VERSION=1.36
 inherit perl-module
diff --git a/dev-perl/ImageInfo/ImageInfo-1.380.0.ebuild b/dev-perl/Image-Info/Image-Info-1.380.0.ebuild
similarity index 86%
rename from dev-perl/ImageInfo/ImageInfo-1.380.0.ebuild
rename to dev-perl/Image-Info/Image-Info-1.380.0.ebuild
index 344487b23864..8abac59b8913 100644
--- a/dev-perl/ImageInfo/ImageInfo-1.380.0.ebuild
+++ b/dev-perl/Image-Info/Image-Info-1.380.0.ebuild
@@ -1,10 +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
 
-MY_PN=Image-Info
 MODULE_AUTHOR=SREZIC
 MODULE_VERSION=1.38
 inherit perl-module
diff --git a/dev-perl/ImageInfo/Manifest b/dev-perl/Image-Info/Manifest
similarity index 100%
rename from dev-perl/ImageInfo/Manifest
rename to dev-perl/Image-Info/Manifest
diff --git a/dev-perl/ImageInfo/metadata.xml b/dev-perl/Image-Info/metadata.xml
similarity index 100%
rename from dev-perl/ImageInfo/metadata.xml
rename to dev-perl/Image-Info/metadata.xml
diff --git a/dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild b/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild
similarity index 87%
rename from dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild
rename to dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild
index af889f2fd0b0..e7f1021e1d44 100644
--- a/dev-perl/ImageSize/ImageSize-3.232.0-r1.ebuild
+++ b/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild
@@ -1,10 +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
 
-MY_PN=Image-Size
 MODULE_AUTHOR=RJRAY
 MODULE_VERSION=3.232
 inherit perl-module
diff --git a/dev-perl/ImageSize/ImageSize-3.300.0.ebuild b/dev-perl/Image-Size/Image-Size-3.300.0.ebuild
similarity index 89%
rename from dev-perl/ImageSize/ImageSize-3.300.0.ebuild
rename to dev-perl/Image-Size/Image-Size-3.300.0.ebuild
index b9891a81703d..7b8b7003b362 100644
--- a/dev-perl/ImageSize/ImageSize-3.300.0.ebuild
+++ b/dev-perl/Image-Size/Image-Size-3.300.0.ebuild
@@ -1,10 +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
 
-MY_PN=Image-Size
 MODULE_AUTHOR=RJRAY
 MODULE_VERSION=3.300
 inherit perl-module
diff --git a/dev-perl/ImageSize/Manifest b/dev-perl/Image-Size/Manifest
similarity index 100%
rename from dev-perl/ImageSize/Manifest
rename to dev-perl/Image-Size/Manifest
diff --git a/dev-perl/ImageSize/metadata.xml b/dev-perl/Image-Size/metadata.xml
similarity index 100%
rename from dev-perl/ImageSize/metadata.xml
rename to dev-perl/Image-Size/metadata.xml
diff --git a/dev-perl/ImageInfo/ChangeLog-2015 b/dev-perl/ImageInfo/ChangeLog-2015
deleted file mode 100644
index 242f1c9efae4..000000000000
--- a/dev-perl/ImageInfo/ChangeLog-2015
+++ /dev/null
@@ -1,394 +0,0 @@
-# ChangeLog for dev-perl/ImageInfo
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ImageInfo/ChangeLog,v 1.109 2015/07/01 12:23:29 zlogene Exp $
-
-*ImageInfo-1.380.0 (01 Jul 2015)
-
-  01 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> +ImageInfo-1.380.0.ebuild:
-  Version bump
-
-  12 Sep 2014; Mikle Kolyada <zlogene@gentoo.org> -ImageInfo-1.320.0.ebuild,
-  -ImageInfo-1.330.0.ebuild:
-  Drop old.
-
-  06 Mar 2014; Agostino Sarubbo <ago@gentoo.org> ImageInfo-1.360.0.ebuild:
-  Stable for ppc64, wrt bug #495424
-
-  05 Mar 2014; Agostino Sarubbo <ago@gentoo.org> ImageInfo-1.360.0.ebuild:
-  Stable for ppc, wrt bug #495424
-
-  04 Mar 2014; Agostino Sarubbo <ago@gentoo.org> ImageInfo-1.360.0.ebuild:
-  Stable for x86, wrt bug #495424
-
-  02 Mar 2014; Pacho Ramos <pacho@gentoo.org> ImageInfo-1.360.0.ebuild:
-  amd64 stable, bug #495424
-
-  31 Aug 2013; Mikle Kolyada <zlogene@gentoo.org> ImageInfo-1.330.0.ebuild:
-  ppc/ppc64/x86 stable wrt bug #449590
-
-  31 Aug 2013; Agostino Sarubbo <ago@gentoo.org> ImageInfo-1.330.0.ebuild:
-  Stable for amd64, wrt bug #449590
-
-*ImageInfo-1.360.0 (17 Aug 2013)
-
-  17 Aug 2013; Patrick Lauer <patrick@gentoo.org> +ImageInfo-1.360.0.ebuild:
-  Bump
-
-*ImageInfo-1.340.0 (01 Feb 2013)
-
-  01 Feb 2013; Torsten Veller <tove@gentoo.org> +ImageInfo-1.340.0.ebuild,
-  metadata.xml:
-  Version bump
-
-  06 Jan 2013; Torsten Veller <tove@gentoo.org> -ImageInfo-1.310.0.ebuild:
-  Cleanup
-
-*ImageInfo-1.330.0 (04 Nov 2012)
-
-  04 Nov 2012; Torsten Veller <tove@gentoo.org> +ImageInfo-1.330.0.ebuild:
-  Version bump
-
-  30 Sep 2012; Raúl Porcel <armin76@gentoo.org> ImageInfo-1.310.0.ebuild,
-  ImageInfo-1.320.0.ebuild:
-  Drop alpha keywords
-
-  09 Aug 2012; Brent Baude <ranger@gentoo.org> ImageInfo-1.320.0.ebuild:
-  Marking ImageInfo-1.320.0 ppc for bug 418819
-
-  07 Aug 2012; Brent Baude <ranger@gentoo.org> ImageInfo-1.320.0.ebuild:
-  Marking ImageInfo-1.320.0 ppc64 for bug 418819
-
-  03 Aug 2012; Agostino Sarubbo <ago@gentoo.org> ImageInfo-1.320.0.ebuild:
-  Stable for amd64, wrt bug #418819
-
-  31 Jul 2012; Johannes Huber <johu@gentoo.org> ImageInfo-1.320.0.ebuild:
-  Stable for x86, wrt bug #418819
-
-  24 Jun 2012; Torsten Veller <tove@gentoo.org> metadata.xml:
-  Update CPAN upstream info
-
-  31 Mar 2012; Torsten Veller <tove@gentoo.org> -ImageInfo-1.30.ebuild:
-  Cleanup
-
-  25 Mar 2012; Raúl Porcel <armin76@gentoo.org> ImageInfo-1.30.ebuild,
-  ImageInfo-1.310.0.ebuild, ImageInfo-1.320.0.ebuild:
-  Drop ia64/sparc keywords
-
-  09 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  ImageInfo-1.310.0.ebuild:
-  x86 stable wrt bug #400151
-
-  02 Mar 2012; Brent Baude <ranger@gentoo.org> ImageInfo-1.310.0.ebuild:
-  Marking ImageInfo-1.310.0 ppc64 for bug 400151
-
-  01 Mar 2012; Brent Baude <ranger@gentoo.org> ImageInfo-1.310.0.ebuild:
-  Marking ImageInfo-1.310.0 ppc for bug 400151
-
-*ImageInfo-1.320.0 (29 Feb 2012)
-
-  29 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +ImageInfo-1.320.0.ebuild:
-  Version bump via perl-bump experimental tool.
-
-  25 Feb 2012; Tobias Klausmann <klausman@gentoo.org> ImageInfo-1.310.0.ebuild:
-  Stable on alpha, bug #400151
-
-  24 Feb 2012; Agostino Sarubbo <ago@gentoo.org> ImageInfo-1.310.0.ebuild:
-  Stable for amd64, wrt bug #400151
-
-  04 Sep 2011; Torsten Veller <tove@gentoo.org> -ImageInfo-1.31.ebuild:
-  Cleanup
-
-*ImageInfo-1.310.0 (30 Aug 2011)
-
-  30 Aug 2011; Torsten Veller <tove@gentoo.org> +ImageInfo-1.310.0.ebuild:
-  Change version scheme
-
-  03 Apr 2011; Torsten Veller <tove@gentoo.org> -ImageInfo-1.28.ebuild:
-  Cleanup
-
-  05 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> ImageInfo-1.30.ebuild:
-  ppc64 stable wrt #341865
-
-*ImageInfo-1.31 (30 Sep 2010)
-
-  30 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +ImageInfo-1.31.ebuild:
-  Version bump via perl-bump experimental tool.
-
-  27 Jun 2010; <nixnut@gentoo.org> ImageInfo-1.30.ebuild:
-  ppc stable #323529
-
-  08 May 2010; Raúl Porcel <armin76@gentoo.org> ImageInfo-1.30.ebuild:
-  alpha/ia64/sparc stable wrt #314467
-
-  17 Apr 2010; Torsten Veller <tove@gentoo.org> ImageInfo-1.30.ebuild:
-  Stable on amd64, x86 (#314467)
-
-  24 Dec 2009; Torsten Veller <tove@gentoo.org> -ImageInfo-1.29.ebuild:
-  Cleanup
-
-*ImageInfo-1.30 (10 Nov 2009)
-
-  10 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> +ImageInfo-1.30.ebuild:
-  Version bump via perl-bump experimental tool.
-
-*ImageInfo-1.29 (02 Aug 2009)
-
-  02 Aug 2009; Torsten Veller <tove@gentoo.org> +ImageInfo-1.29.ebuild:
-  Version bump
-
-  11 Jan 2009; Torsten Veller <tove@gentoo.org> -ImageInfo-1.26.ebuild:
-  Cleanup
-
-  11 Jan 2009; Markus Meier <maekke@gentoo.org> ImageInfo-1.28.ebuild:
-  amd64/x86 stable, bug #254334
-
-  10 Jan 2009; Raúl Porcel <armin76@gentoo.org> ImageInfo-1.28.ebuild:
-  ia64 stable wrt #254334
-
-  09 Jan 2009; Joseph Jezak <josejx@gentoo.org> ImageInfo-1.28.ebuild:
-  Marked ppc/ppc64 for bug #254334.
-
-  09 Jan 2009; Tobias Klausmann <klausman@gentoo.org> ImageInfo-1.28.ebuild:
-  Stable on alpha, bug #254334
-
-  09 Jan 2009; Ferris McCormick <fmccor@gentoo.org> ImageInfo-1.28.ebuild:
-  Sparc stable, Bug #254334.
-
-  18 Nov 2008; Torsten Veller <tove@gentoo.org> ImageInfo-1.26.ebuild:
-  New virtuals: module-build
-
-  15 Sep 2008; Torsten Veller <tove@gentoo.org> -ImageInfo-1.23.ebuild,
-  -ImageInfo-1.24.ebuild, -ImageInfo-1.25.ebuild:
-  Cleanup
-
-*ImageInfo-1.28 (09 Aug 2008)
-
-  09 Aug 2008; Torsten Veller <tove@gentoo.org> +ImageInfo-1.28.ebuild:
-  Version bump
-
-  05 Feb 2008; Markus Rothe <corsair@gentoo.org> ImageInfo-1.26.ebuild:
-  Stable on ppc64
-
-  13 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  ImageInfo-1.26.ebuild:
-  ppc. stable
-
-  17 Dec 2007; Samuli Suominen <drac@gentoo.org> ImageInfo-1.26.ebuild:
-  amd64 stable
-
-  06 Dec 2007; Raúl Porcel <armin76@gentoo.org> ImageInfo-1.26.ebuild:
-  alpha/ia64/sparc/x86 stable
-
-  10 Nov 2007; Samuli Suominen <drac@gentoo.org> ImageInfo-1.25.ebuild:
-  amd64 stable
-
-*ImageInfo-1.26 (19 Oct 2007)
-
-  19 Oct 2007; Christian Hartmann <ian@gentoo.org> +ImageInfo-1.26.ebuild:
-  Version bump
-
-  09 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  ImageInfo-1.25.ebuild:
-  Stable on ppc.
-
-  11 Jul 2007; Raúl Porcel <armin76@gentoo.org> ImageInfo-1.25.ebuild:
-  alpha/ia64/x86 stable
-
-  07 Jul 2007; Tom Gall <tgall@gentoo.org> ImageInfo-1.25.ebuild:
-  stable on ppc64
-
-  25 Jun 2007; Michael Cummings <mcummings@gentoo.org>
-  ImageInfo-1.25.ebuild:
-  Marking sparc stable
-
-  21 Jun 2007; Michael Cummings <mcummings@gentoo.org>
-  ImageInfo-1.24.ebuild:
-  Marking sparc stable
-
-*ImageInfo-1.25 (24 May 2007)
-
-  24 May 2007; Michael Cummings <mcummings@gentoo.org>
-  +ImageInfo-1.25.ebuild:
-  Version bump
-
-  05 May 2007; Christian Hartmann <ian@gentoo.org> -ImageInfo-1.16.ebuild,
-  -ImageInfo-1.20.ebuild, -ImageInfo-1.21.ebuild, -ImageInfo-1.22.ebuild:
-  Cleanup
-
-  05 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  ImageInfo-1.23.ebuild:
-  ppc stable
-
-  16 Apr 2007; Markus Rothe <corsair@gentoo.org> ImageInfo-1.23.ebuild:
-  Stable on ppc64
-
-  08 Apr 2007; Andrej Kacian <ticho@gentoo.org> ImageInfo-1.23.ebuild:
-  Stable on x86, bug #169152.
-
-*ImageInfo-1.24 (11 Mar 2007)
-
-  11 Mar 2007; Michael Cummings <mcummings@gentoo.org>
-  +ImageInfo-1.24.ebuild:
-  Version bump
-
-  22 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> ImageInfo-1.23.ebuild:
-  Stable on Alpha + IA64.
-
-  11 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> ImageInfo-1.23.ebuild:
-  Stable on sparc
-
-  07 Jan 2007; Michael Cummings <mcummings@gentoo.org>
-  ImageInfo-1.23.ebuild:
-  Marking amd64 stable
-
-*ImageInfo-1.23 (29 Nov 2006)
-
-  29 Nov 2006; Yuval Yaari <yuval@gentoo.org> +ImageInfo-1.23.ebuild:
-  Version bump
-
-  21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  ImageInfo-1.22.ebuild:
-  ppc stable
-
-  20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> ImageInfo-1.22.ebuild:
-  Stable on Alpha.
-
-  15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> ImageInfo-1.22.ebuild:
-  Stable on ia64.
-
-  11 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> ImageInfo-1.22.ebuild:
-  Stable on sparc
-
-  10 Oct 2006; Michael Cummings <mcummings@gentoo.org>
-  -ImageInfo-1.15.ebuild, ImageInfo-1.16.ebuild, ImageInfo-1.20.ebuild,
-  ImageInfo-1.21.ebuild, ImageInfo-1.22.ebuild:
-  Keywording amd64; cleaned up stale ebuild
-
-  17 Aug 2006; Michael Cummings <mcummings@gentoo.org>
-  ImageInfo-1.20.ebuild:
-  Marking amd64 stable
-
-  05 Aug 2006; Michael Cummings <mcummings@gentoo.org>
-  ImageInfo-1.15.ebuild, ImageInfo-1.16.ebuild, ImageInfo-1.20.ebuild,
-  ImageInfo-1.21.ebuild, ImageInfo-1.22.ebuild:
-  Adding perl dep; fixed DEPEND
-
-*ImageInfo-1.22 (30 Jul 2006)
-
-  30 Jul 2006; Michael Cummings <mcummings@gentoo.org>
-  +ImageInfo-1.22.ebuild:
-  Version bump
-
-  18 Jul 2006; Michael Cummings <mcummings@gentoo.org>
-  ImageInfo-1.20.ebuild, ImageInfo-1.21.ebuild:
-  Forcing mb version
-
-  10 Jul 2006; Aron Griffis <agriffis@gentoo.org> ImageInfo-1.20.ebuild:
-  Mark 1.20 stable on ia64
-
-  04 Jul 2006; Christian Hartmann <ian@gentoo.org> ImageInfo-1.15.ebuild,
-  ImageInfo-1.16.ebuild, ImageInfo-1.20.ebuild, ImageInfo-1.21.ebuild:
-  Fixed RDEPEND wrt bug #134781; fixed DEPEND
-
-  12 Jun 2006; Michael Cummings <mcummings@gentoo.org>
-  ImageInfo-1.20.ebuild:
-  marking stable sparc
-
-*ImageInfo-1.21 (22 May 2006)
-
-  22 May 2006; <mcummings@gentoo.org> +ImageInfo-1.21.ebuild:
-  Version bump
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
-  files/digest-ImageInfo-1.15, files/digest-ImageInfo-1.16, Manifest:
-  Fixing SHA256 digest, pass four
-
-*ImageInfo-1.20 (26 Apr 2006)
-
-  26 Apr 2006; <mcumming@gentoo.org> +ImageInfo-1.20.ebuild:
-  Version bump
-
-  27 Nov 2005; Tom Gall <tgall@gentoo.org> ImageInfo-1.16.ebuild:
-  stable on ppc64
-
-  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> ImageInfo-1.16.ebuild:
-  Mark 1.16 stable on ia64
-
-  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> ImageInfo-1.16.ebuild:
-  add ~ia64
-
-  01 May 2005; Tom Martin <slarti@gentoo.org> ImageInfo-1.16.ebuild:
-  Stable on amd64.
-
-  30 Apr 2005; Michael Cummings <mcummings@gentoo.org> :
-  Manifest was reported bad in bug 90963 - regenerating, confirmed file
-  downloaded was a real tarball
-
-  29 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> ImageInfo-1.16.ebuild:
-  Stable on sparc
-
-  27 Apr 2005; Michael Cummings <mcummings@gentoo.org> ImageInfo-1.15.ebuild,
-  ImageInfo-1.16.ebuild:
-  Cleaning
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  24 Dec 2004; Yuta SATOH <nigoro@gentoo.org> ImageInfo-1.16.ebuild:
-  added ~ppc64
-
-  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> ImageInfo-1.16.ebuild:
-  Stable on alpha.
-
-*ImageInfo-1.16 (08 Jan 2004)
-
-  08 Jan 2004; Martin Holzer <mholzer@gentoo.org> ImageInfo-1.16.ebuild:
-  Version bumped.
-
-  27 Dec 2003; Michael Cummings,,, <mcummings@gentoo.org>
-  ImageInfo-1.15.ebuild:
-  Tested on x86
-
-  27 Dec 2003; Michael Cummings,,, <mcummings@gentoo.org>
-  ImageInfo-1.04-r1.ebuild, ImageInfo-1.04-r2.ebuild:
-  No longer at CPAN
-
-  27 Dec 2003; Michael Cummings,,, <mcummings@gentoo.org>
-  ImageInfo-1.15.ebuild:
-  Tested on a sparc(64)
-
-*ImageInfo-1.15 (08 Dec 2003)
-
-  08 Dec 2003; Martin Holzer <mholzer@gentoo.org> ImageInfo-1.15.ebuild:
-  Version bumped.
-
-*ImageInfo-1.04-r2 (21 Jun 2003)
- 
-  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Added missing changelog entry.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  29 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog  :
-  forced version bump to install into correct locations
-
-*ImageInfo-1.04-r1 (5 May 2002)
-
-  31 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> ImageInfo-1.04-r1.ebuild : 
-
-  Added ppc to KEYWORDS.
-
-  5 May 2002; Seemant Kulleen <seemant@gentoo.org> ImageInfo-1.04-r1.ebuild
-  files/digest-ImageInfo-1.04-r1 :
-
-  Conversion to eclasses
-
-*ImageInfo-1.04 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/dev-perl/ImageSize/ChangeLog-2015 b/dev-perl/ImageSize/ChangeLog-2015
deleted file mode 100644
index a0fcdcfdb59f..000000000000
--- a/dev-perl/ImageSize/ChangeLog-2015
+++ /dev/null
@@ -1,300 +0,0 @@
-# ChangeLog for dev-perl/ImageSize
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ImageSize/ChangeLog,v 1.85 2015/07/04 11:20:13 dilfridge Exp $
-
-*ImageSize-3.300.0 (04 Jul 2015)
-
-  04 Jul 2015; Andreas K. Huettel <dilfridge@gentoo.org>
-  +ImageSize-3.300.0.ebuild:
-  Version bump
-
-*ImageSize-3.232.0-r1 (22 Aug 2014)
-
-  22 Aug 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
-  +ImageSize-3.232.0-r1.ebuild, -ImageSize-3.232.0.ebuild:
-  bumped EAPI to 5; committed directly to stable as no other changes present and
-  revbump helps stable systems to keep from dieing on perl-5.18 upgrade
-
-  06 Jan 2013; Torsten Veller <tove@gentoo.org> -ImageSize-3.230.0.ebuild,
-  -ImageSize-3.231.0.ebuild:
-  Cleanup
-
-  02 Oct 2012; Anthony G. Basile <blueness@gentoo.org> ImageSize-3.232.0.ebuild:
-  stable ppc ppc64, bug #433814
-
-  30 Sep 2012; Raúl Porcel <armin76@gentoo.org> ImageSize-3.230.0.ebuild,
-  ImageSize-3.231.0.ebuild, ImageSize-3.232.0.ebuild:
-  Drop alpha keywords
-
-  12 Sep 2012; Johannes Huber <johu@gentoo.org> ImageSize-3.232.0.ebuild:
-  Stable for x86, wrt bug #428986
-
-  12 Sep 2012; Agostino Sarubbo <ago@gentoo.org> ImageSize-3.232.0.ebuild:
-  Stable for amd64, wrt bug #428986
-
-  24 Jun 2012; Torsten Veller <tove@gentoo.org> metadata.xml:
-  Update CPAN upstream info
-
-*ImageSize-3.232.0 (31 May 2012)
-
-  31 May 2012; Torsten Veller <tove@gentoo.org> +ImageSize-3.232.0.ebuild:
-  Version bump
-
-*ImageSize-3.231.0 (26 May 2012)
-
-  26 May 2012; Torsten Veller <tove@gentoo.org> +ImageSize-3.231.0.ebuild:
-  Version bump
-
-  21 Apr 2012; Torsten Veller <tove@gentoo.org> -ImageSize-3.2.2.0.ebuild:
-  Cleanup
-
-  25 Mar 2012; Raúl Porcel <armin76@gentoo.org> ImageSize-3.2.2.0.ebuild,
-  ImageSize-3.230.0.ebuild:
-  Drop ia64/sparc
-
-  09 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  ImageSize-3.230.0.ebuild:
-  x86 stable wrt bug #400153
-
-  02 Mar 2012; Brent Baude <ranger@gentoo.org> ImageSize-3.230.0.ebuild:
-  Marking ImageSize-3.230.0 ppc64 for bug 400153
-
-  01 Mar 2012; Brent Baude <ranger@gentoo.org> ImageSize-3.230.0.ebuild:
-  Marking ImageSize-3.230.0 ppc for bug 400153
-
-  25 Feb 2012; Tobias Klausmann <klausman@gentoo.org> ImageSize-3.230.0.ebuild:
-  Stable on alpha, bug #400153
-
-  24 Feb 2012; Agostino Sarubbo <ago@gentoo.org> ImageSize-3.230.0.ebuild:
-  Stable for amd64, wrt bug #400153
-
-  04 Sep 2011; Torsten Veller <tove@gentoo.org> -ImageSize-3.230.ebuild:
-  Cleanup
-
-*ImageSize-3.230.0 (30 Aug 2011)
-
-  30 Aug 2011; Torsten Veller <tove@gentoo.org> +ImageSize-3.230.0.ebuild:
-  Change version scheme
-
-  14 Jan 2011; Torsten Veller <tove@gentoo.org> -ImageSize-3.1.1.ebuild,
-  -ImageSize-3.2.2.1.ebuild:
-  Cleanup
-
-*ImageSize-3.230 (14 Jan 2011)
-
-  14 Jan 2011; Torsten Veller <tove@gentoo.org> -ImageSize-3.2.3.0.ebuild,
-  +ImageSize-3.230.ebuild:
-  Convert version
-
-  05 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
-  ImageSize-3.2.2.0.ebuild:
-  ppc64 stable wrt #341865
-
-*ImageSize-3.2.3.0 (01 Sep 2010)
-
-  01 Sep 2010; Torsten Veller <tove@gentoo.org> +ImageSize-3.2.3.0.ebuild:
-  Version bump
-
-  27 Jun 2010; <nixnut@gentoo.org> ImageSize-3.2.2.0.ebuild:
-  ppc stable #323529
-
-  08 May 2010; Raúl Porcel <armin76@gentoo.org> ImageSize-3.2.2.0.ebuild:
-  alpha/ia64/sparc stable wrt #314467
-
-*ImageSize-3.2.2.1 (29 Apr 2010)
-
-  29 Apr 2010; Torsten Veller <tove@gentoo.org> +ImageSize-3.2.2.1.ebuild:
-  Version bump
-
-  17 Apr 2010; Torsten Veller <tove@gentoo.org> ImageSize-3.2.2.0.ebuild:
-  Stable on amd64, x86 (#314467)
-
-  24 Dec 2009; Torsten Veller <tove@gentoo.org> -ImageSize-3.2.ebuild,
-  -ImageSize-3.2.1.0.ebuild:
-  Cleanup
-
-*ImageSize-3.2.2.0 (10 Nov 2009)
-
-  10 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
-  +ImageSize-3.2.2.0.ebuild:
-  Version bump via perl-bump experimental tool.
-
-*ImageSize-3.2.1.0 (22 Oct 2009)
-
-  22 Oct 2009; Torsten Veller <tove@gentoo.org> +ImageSize-3.2.1.0.ebuild:
-  Version bump
-
-  19 Jul 2009; Torsten Veller <tove@gentoo.org> ImageSize-3.1.1.ebuild,
-  ImageSize-3.2.ebuild:
-  IO-Compress replaces Compress-Zlib
-
-*ImageSize-3.2 (24 Feb 2009)
-
-  24 Feb 2009; Robin H. Johnson <robbat2@gentoo.org> +ImageSize-3.2.ebuild:
-  Version bump via perl-bump experimental tool.
-
-  11 Jan 2009; Torsten Veller <tove@gentoo.org> -ImageSize-3.1.ebuild:
-  Cleanup
-
-  11 Jan 2009; Markus Meier <maekke@gentoo.org> ImageSize-3.1.1.ebuild:
-  amd64/x86 stable, bug #254335
-
-  10 Jan 2009; Raúl Porcel <armin76@gentoo.org> ImageSize-3.1.1.ebuild:
-  ia64 stable wrt #254335
-
-  09 Jan 2009; Joseph Jezak <josejx@gentoo.org> ImageSize-3.1.1.ebuild:
-  Marked ppc/ppc64 stable for bug #254335.
-
-  09 Jan 2009; Tobias Klausmann <klausman@gentoo.org>
-  ImageSize-3.1.1.ebuild:
-  Stable on alpha, bug #254335
-
-  09 Jan 2009; Ferris McCormick <fmccor@gentoo.org> ImageSize-3.1.1.ebuild:
-  Sparc stable, Bug #254335.
-
-  18 Nov 2008; Torsten Veller <tove@gentoo.org> ImageSize-3.1.ebuild,
-  ImageSize-3.1.1.ebuild:
-  New virtuals: Compress-Zlib module-build
-
-  15 Sep 2008; Torsten Veller <tove@gentoo.org> -ImageSize-2.992.ebuild,
-  -ImageSize-3.0.ebuild, -ImageSize-3.01.ebuild:
-  Cleanup
-
-*ImageSize-3.1.1 (09 Aug 2008)
-
-  09 Aug 2008; Torsten Veller <tove@gentoo.org> +ImageSize-3.1.1.ebuild:
-  Version bump. Fixed license.
-
-  05 Feb 2008; Markus Rothe <corsair@gentoo.org> ImageSize-3.1.ebuild:
-  Stable on ppc64
-
-  13 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
-  ImageSize-3.1.ebuild:
-  ppc. stable
-
-  17 Dec 2007; Samuli Suominen <drac@gentoo.org> ImageSize-3.1.ebuild:
-  amd64 stable
-
-  06 Dec 2007; Raúl Porcel <armin76@gentoo.org> ImageSize-3.1.ebuild:
-  alpha/ia64/sparc/x86 stable
-
-*ImageSize-3.1 (19 Oct 2007)
-
-  19 Oct 2007; Christian Hartmann <ian@gentoo.org> +ImageSize-3.1.ebuild:
-  Version bump
-
-  16 Apr 2007; Markus Rothe <corsair@gentoo.org> ImageSize-3.01.ebuild:
-  Stable on ppc64
-
-  05 Mar 2007; Andrej Kacian <ticho@gentoo.org> ImageSize-3.01.ebuild:
-  Stable on x86, bug #169152.
-
-  22 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> ImageSize-3.01.ebuild:
-  Stable on Alpha + IA64.
-
-  24 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  ImageSize-3.01.ebuild:
-  Stable on ppc.
-
-  25 Nov 2006; Michael Cummings <mcummings@gentoo.org>
-  ImageSize-3.01.ebuild:
-  sparc stable
-
-  24 Nov 2006; Michael Cummings <mcummings@gentoo.org>
-  ImageSize-3.01.ebuild:
-  amd64 stable
-
-  21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  ImageSize-3.0.ebuild:
-  ppc stable
-
-  20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> ImageSize-3.0.ebuild:
-  Stable on Alpha.
-
-  15 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> ImageSize-3.0.ebuild:
-  Stable on ia64.
-
-  11 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> ImageSize-3.0.ebuild:
-  Stable on sparc
-
-  10 Oct 2006; Michael Cummings <mcummings@gentoo.org>
-  -ImageSize-2.99-r1.ebuild, ImageSize-2.992.ebuild, ImageSize-3.0.ebuild,
-  ImageSize-3.01.ebuild:
-  Keywording amd64; cleaned up stale ebuild
-
-  02 Oct 2006; Christian Hartmann <ian@gentoo.org> ImageSize-3.01.ebuild:
-  Fixed bug #149713
-
-  30 Sep 2006; Brent Baude <ranger@gentoo.org> ImageSize-3.01.ebuild:
-  Marking ImageSize-3.01 ~ppc64 with new keyword per bug #149612
-
-*ImageSize-3.01 (30 Sep 2006)
-
-  30 Sep 2006; Christian Hartmann <ian@gentoo.org> +ImageSize-3.01.ebuild:
-  Version bump; added tests
-
-  05 Aug 2006; Michael Cummings <mcummings@gentoo.org>
-  ImageSize-2.99-r1.ebuild, ImageSize-2.992.ebuild, ImageSize-3.0.ebuild:
-  Adding perl dep; fixed header; fixed DEPEND
-
-*ImageSize-3.0 (23 Jun 2006)
-
-  23 Jun 2006; Michael Cummings <mcummings@gentoo.org>
-  +ImageSize-3.0.ebuild:
-  Version bump upstream
-
-  06 Feb 2006; Simon Stelling <blubb@gentoo.org> ImageSize-2.992.ebuild:
-  stable on amd64
-
-  04 Feb 2006; Aron Griffis <agriffis@gentoo.org> ImageSize-2.992.ebuild:
-  Mark 2.992 stable on ia64
-
-  31 Jan 2006; Aron Griffis <agriffis@gentoo.org> ImageSize-2.992.ebuild:
-  Mark 2.992 stable on alpha
-
-  21 Jan 2006; Markus Rothe <corsair@gentoo.org> ImageSize-2.992.ebuild:
-  Stable on ppc64
-
-  15 Jan 2006; Michael Hanselmann <hansmi@gentoo.org>
-  ImageSize-2.992.ebuild:
-  Stable on ppc.
-
-  13 Jan 2006; Michael Cummings <mcummings@gentoo.org>
-  ImageSize-2.992.ebuild:
-  marking stable sparc x86
-
-  27 Nov 2005; Tom Gall <tgall@gentoo.org> ImageSize-2.99-r1.ebuild:
-  stable on ppc64
-
-  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> ImageSize-2.992.ebuild:
-  add ~ia64
-
-*ImageSize-2.992 (09 May 2005)
-
-  09 May 2005; Michael Cummings <mcummings@gentoo.org>
-  ImageSize-2.99-r1.ebuild, -ImageSize-2.99.ebuild, +ImageSize-2.992.ebuild:
-  Version bump
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  24 Dec 2004; Yuta SATOH <nigoro@gentoo.org> ImageSize-2.99-r1.ebuild:
-  added ~ppc64
-
-  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> ImageSize-2.99-r1.ebuild:
-  Stable on alpha.
-
-*ImageSize-2.99-r1 (21 Jun 2003)
- 
-  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Added missing changelog entry.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  29 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog  :
-  forced version bump to install into correct locations
-
-*ImageSize-2.99 (24 Oct 2002)
-
-  24 Oct 2002; <mcummings@gentoo.org> ImageSize-2.99.ebuild ChangeLog:
-  Initial import. Ebuild submitted by ryan.shaw@standfordalumni.org.
diff --git a/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
new file mode 100644
index 000000000000..196375d6d5f0
--- /dev/null
+++ b/dev-perl/LWP-UserAgent-Determined/LWP-UserAgent-Determined-1.70.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=ALEXMV
+DIST_VERSION=1.07
+inherit perl-module
+
+DESCRIPTION="A virtual browser that retries errors"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-perl/libwww-perl"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/LWP-UserAgent-Determined/Manifest b/dev-perl/LWP-UserAgent-Determined/Manifest
index 75a167c0263b..34c483c43d35 100644
--- a/dev-perl/LWP-UserAgent-Determined/Manifest
+++ b/dev-perl/LWP-UserAgent-Determined/Manifest
@@ -1 +1,2 @@
 DIST LWP-UserAgent-Determined-1.06.tar.gz 6874 SHA256 c31d8e16dc92e2113c81cdbfb11149cfd19039e789f77cd34333ac9184346fc5 SHA512 05c85e923b7e2a643455242da2785743be6a1889200a1a922e81fd882943ad136cd4050d96e24af1b60000e264272e5b1fd04e95e8113923f412494adceb4f66 WHIRLPOOL b694f28313d4df40538f7a024665061c4ad91a86752005efafc88bc96f365737262ba5dbbed96ab0ecc085ee6abaaaf79967eadcd88469a8bbc454c36b1cfb63
+DIST LWP-UserAgent-Determined-1.07.tar.gz 6822 SHA256 06d8d50e8cd3692a11cb4fb44a2f84e5476a98f0e2e6a4a0dfce9f67e55ddb53 SHA512 bed056468366bf86f0711a23c5bdb502a614efa2fd80d632f8d43d33295309d0ee88e439933cb3eda99192ad7d7025d0a7f6f0a53a45e79e70512771bb58ae7d WHIRLPOOL 849d33ce3a8c5d2a5ae5d773524daa88ede216be52f99b7c71ac3460aad21af753b6680abe8867b6bab5f772877e3d994b8ff27e3a837503a4ae46d409f11184
diff --git a/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.100.0.ebuild b/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.100.0.ebuild
new file mode 100644
index 000000000000..62fc239115ae
--- /dev/null
+++ b/dev-perl/LWPx-ParanoidAgent/LWPx-ParanoidAgent-1.100.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_SECTION=lwp
+DIST_AUTHOR=SAXJAZMAN
+DIST_VERSION=1.10
+inherit perl-module
+
+DESCRIPTION="Subclass of LWP::UserAgent that protects you from harm"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Net::SSL 2.85 -> Crypt-SSLeay 0.58
+DEPEND="dev-perl/libwww-perl
+	dev-perl/Net-DNS
+	virtual/perl-Time-HiRes
+	>=dev-perl/Crypt-SSLeay-0.580.0
+"
+RDEPEND="${DEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+src_test() {
+	local my_test_control
+	my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+	if has network ${my_test_control}; then
+		einfo "Enabling ONLINE_TESTS"
+		export ONLINE_TESTS=1
+	fi
+	perl-module_src_test
+}
diff --git a/dev-perl/LWPx-ParanoidAgent/Manifest b/dev-perl/LWPx-ParanoidAgent/Manifest
index cf7b6131a093..0db62946833e 100644
--- a/dev-perl/LWPx-ParanoidAgent/Manifest
+++ b/dev-perl/LWPx-ParanoidAgent/Manifest
@@ -1 +1,2 @@
 DIST LWPx-ParanoidAgent-1.07.tar.gz 14244 SHA256 bd7ccbe6ed6b64195a967e9b2b04c185b7b97e8ec5a8835bb45dbcd42a18e76a SHA512 12221010cee50b3cbbc016bb19c664fa5b1af4c27e97d32c173423b8dca586933ebefdf5ee1b293258646eb753ca478b8e1ec9a22ee7931617d675a77551ef0c WHIRLPOOL 1e81722aed7b7d41ac3293b5a82a835f36a5eea6299c2dbf11837290a5465673710d5cc5791e233ff2f9eac8e5cdf49ccff64dfa941b16aed24d450ecf3141f7
+DIST LWPx-ParanoidAgent-1.10.tar.gz 17665 SHA256 84130aa89cba829fe6a25c9356474e3bf15eaccd6319a71d4ea0e356cf356044 SHA512 8a1a1cdc4ab826b66abedfbbe7baee694d1083fc6dce2c2f6b69bf5e369ef0212ffdcd2afc9fadafa9977e3be9f7a4e4b1ea092e6c6773c1f9fc356c87c5434d WHIRLPOOL 398140fd71d5908812011c5ce81e6ad661c35b6042538a650c96777dbe985e215bb92cdda1441db85d24a50d9a0a33249d019aad9b48c8ead267b3a792933401
diff --git a/dev-perl/Lexical-Persistence/Lexical-Persistence-1.23.0.ebuild b/dev-perl/Lexical-Persistence/Lexical-Persistence-1.23.0.ebuild
new file mode 100644
index 000000000000..e67f1d058093
--- /dev/null
+++ b/dev-perl/Lexical-Persistence/Lexical-Persistence-1.23.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=RCAPUTO
+DIST_VERSION=1.023
+inherit perl-module
+
+DESCRIPTION="Bind lexicals to persistent data"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="test"
+
+# constant -> perl
+RDEPEND="
+	>=dev-perl/PadWalker-1.960.0
+	>=dev-perl/Devel-LexAlias-0.50.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		>=virtual/perl-Carp-1.260.0
+		>=virtual/perl-Scalar-List-Utils-1.290.0
+		>=virtual/perl-Test-Simple-0.980.0
+	)
+"
+src_test() {
+	perl_rm_files "t/02_pod.t" "t/03_pod_coverage.t" "t/release-pod-coverage.t" "t/release-pod-syntax.t"
+	perl-module_src_test
+}
diff --git a/dev-perl/Lexical-Persistence/Manifest b/dev-perl/Lexical-Persistence/Manifest
index 57db080b11a3..0fc6aea3caa8 100644
--- a/dev-perl/Lexical-Persistence/Manifest
+++ b/dev-perl/Lexical-Persistence/Manifest
@@ -1 +1,2 @@
 DIST Lexical-Persistence-1.020.tar.gz 12228 SHA256 972cd0c175947f8789927eb32bfa01d21b3bb981d8841f7e0c74c26c2fd59172 SHA512 fc39877eab0f99fd7500540f12fb2db769ae8150569298d70b968701e82d9fbd46970fabd9bd0270fe42894d84788a3b1248fd2da14a180f55d6ef18970076e9 WHIRLPOOL a8812481b235f62f7623da924766b469bb19dfa513e22506f5976e532b083f721430f16376a546e42cb557cc0e81be04f2215d07f926f31d39fb31d1332eba8f
+DIST Lexical-Persistence-1.023.tar.gz 27609 SHA256 94d2fa4a743885ca9cea9f7042d9e7a3a69f5bd7cc18aa630c7f7f5e8ae36944 SHA512 b67e17bde4f6fc6209516ee6ec74aa273367f83b3bb9d9fe2be3ea2e8a574c1b7bbf751f370a54e1e8de4c845f07cb3de4f142f48e3234efdb13ea11176000db WHIRLPOOL 3acd32a1ca34c84d9d2d54230e241ddb94b9f5421b5ab80eb9a6f70970e377ae8c1d3cf60b787ef25b9cefe3c529bd5a0a1a9c3a22482ee17665a93109564758
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.40.0.ebuild b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.40.0.ebuild
new file mode 100644
index 000000000000..9e6eb819f7e5
--- /dev/null
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Lingua-EN-Numbers-Ordinate-1.40.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=1.04
+inherit perl-module
+
+DESCRIPTION="Convert cardinal numbers(3) to ordinal numbers(3rd)"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
diff --git a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
index 03798c5a0489..864df9ec4564 100644
--- a/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
+++ b/dev-perl/Lingua-EN-Numbers-Ordinate/Manifest
@@ -1 +1,2 @@
 DIST Lingua-EN-Numbers-Ordinate-1.02.tar.gz 5564 SHA256 350a6de884a6295974f2919c5af76d4103368e855ac8fe739460f4d55aee7719 SHA512 8c17341de354484a49204335f680da0eac6992f152978277ee204f42e8a97cf12e30d908b1797d86a09fc95dc3f0a821014f9ee976380807bdea6cf94f88c296 WHIRLPOOL fd4865e0cbcec6324b74021c93cee722635e6d80dd6dbbd85fb5fe6fe5009cad19bec2392dd5498a8dbeca68297e31e5bd35756786293542876d99743f67bf91
+DIST Lingua-EN-Numbers-Ordinate-1.04.tar.gz 12019 SHA256 26973c2eb43672c3f61ad7d3fef12ef1c64a034da494a0ee0d910c3e0808019f SHA512 f8f5cbfc9ae1d7b4e5e134c8fb089f6ec4ecfd90e0168ece874b007ae8b74936e5aecc38344c036c0845ab7a8c192d07c5a2cdad8f96176c71e89e2e4ae1211e WHIRLPOOL f4e9bb389866e0aa45920142ee5c92b51288a2a17846cff6215c76d1680515874429f00e3c2bcb2a6071cc7023f9188782176de1ca5bfaa4e41439f9a53b77e0
diff --git a/dev-perl/Lingua-PT-Stemmer/Lingua-PT-Stemmer-0.20.0.ebuild b/dev-perl/Lingua-PT-Stemmer/Lingua-PT-Stemmer-0.20.0.ebuild
new file mode 100644
index 000000000000..b59e2bb7ba89
--- /dev/null
+++ b/dev-perl/Lingua-PT-Stemmer/Lingua-PT-Stemmer-0.20.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=0.02
+inherit perl-module
+
+DESCRIPTION="Portuguese language stemming"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test )
+"
diff --git a/dev-perl/Lingua-PT-Stemmer/Manifest b/dev-perl/Lingua-PT-Stemmer/Manifest
index 4962bf592651..d4605989b2bb 100644
--- a/dev-perl/Lingua-PT-Stemmer/Manifest
+++ b/dev-perl/Lingua-PT-Stemmer/Manifest
@@ -1 +1,2 @@
 DIST Lingua-PT-Stemmer-0.01.tar.gz 4864 SHA256 45912ab6d465cb975f86cccc212f888c04ad7c84511fbf4760894e8b6f613887 SHA512 601a6acc594fc73d153986b744807e56ce116e265c34403b0646681416ec482bb4bf9d2196eb3d463e4c3928c56c3f6fbd3ec971646b89008fa20965313a26ee WHIRLPOOL d35cf3e5697c6e0d81b52a5f298e14ec3f8d1fb9d854ff4d68f684a0889cac0f245b1df1f37154b2d597fc50dc12b4b949728bf0390486fb86608024880fb3a1
+DIST Lingua-PT-Stemmer-0.02.tar.gz 12747 SHA256 596df01f8ab79ffffd450e94836a544371d8a4c93a15f7e88ea2f1b79c46849d SHA512 3537d947b9deeab15376502beb5540fe6afdabc1cd5fd18ec399d12f4dc715def15eb5c9cb052eb5be4b3c03731fd0f0d25ef84bec797f38c3e0f0785c4859b5 WHIRLPOOL 2da1a16c1572eed9a7ce4d77b0a5a1e5308271fb0a0325c35cae4028d5f11089f48b68cc7a1d0f23d8dc8f0b8add908d35f5af43f19b29c576a38341a1874dd3
diff --git a/dev-perl/Lingua-Stem-Ru/Lingua-Stem-Ru-0.40.0.ebuild b/dev-perl/Lingua-Stem-Ru/Lingua-Stem-Ru-0.40.0.ebuild
new file mode 100644
index 000000000000..dd647eee9fa1
--- /dev/null
+++ b/dev-perl/Lingua-Stem-Ru/Lingua-Stem-Ru-0.40.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=NEILB
+DIST_VERSION=0.04
+inherit perl-module
+
+DESCRIPTION="Porter's stemming algorithm for Russian (KOI8-R only)"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+RDEPEND="
+	virtual/perl-Carp
+	>=virtual/perl-Exporter-5.570.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/Lingua-Stem-Ru/Manifest b/dev-perl/Lingua-Stem-Ru/Manifest
index ff975ac3f1f1..4ffa47170cb6 100644
--- a/dev-perl/Lingua-Stem-Ru/Manifest
+++ b/dev-perl/Lingua-Stem-Ru/Manifest
@@ -1 +1,2 @@
 DIST Lingua-Stem-Ru-0.01.tar.gz 209087 SHA256 0606a3d93dfa582f4a0e2898a44dc711f48491baf5b904bd12c14d2708790f5f SHA512 871aa32bfaf9c922c1208d82922c617bd21c4586d9f26f1f37d32f4d5250109b4c4ab652fb69c59dee7edb5e5cb3ebb82ed85e86daf600bb863d55842fdfd692 WHIRLPOOL 7b80aa19dffefb163981bb7007f4f80627ac71bcc44b2dacaebc92514b6ac151cc6bb4198214065c969ed5f2da1f4f60f91d509d08c0b626bc234a4327023fe5
+DIST Lingua-Stem-Ru-0.04.tar.gz 217502 SHA256 1270ceb74764fdb958370a808834af976e87f69a85470f8bc46258797eab5228 SHA512 30ad7e74cbc065d3a9534f099a7c08b7aef5ec2290609e72704d1ae4ae0ea1a3622dfd0a4012fb169903fe7ef959d24d38e51cd330bc1c38ac09a1d50a76962e WHIRLPOOL 7fca56b6f3ae7e489ce6384da9cc59b283d48b59f5bb830f1b9c8a44916e3e0afa31fa224325418b9c36327ab78da11d8de4d16e88b739c3d6c7085486e432a6
diff --git a/dev-perl/Log-Any/Log-Any-1.38.0.ebuild b/dev-perl/Log-Any/Log-Any-1.38.0.ebuild
new file mode 100644
index 000000000000..d8fdbf381b9d
--- /dev/null
+++ b/dev-perl/Log-Any/Log-Any-1.38.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DAGOLDEN
+DIST_VERSION=1.038
+inherit perl-module
+
+DESCRIPTION="Bringing loggers and listeners together"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="test minimal"
+
+# Test::Builder needed for Log/Any/Adapter/Test.pm
+# constant -> perl
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Exporter
+	virtual/perl-IO
+	virtual/perl-Test-Simple
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.170.0
+	test? (
+		!minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 )
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+	)
+"
diff --git a/dev-perl/Log-Any/Manifest b/dev-perl/Log-Any/Manifest
index fd10cb3560c4..3e311ad501ed 100644
--- a/dev-perl/Log-Any/Manifest
+++ b/dev-perl/Log-Any/Manifest
@@ -1,2 +1,3 @@
 DIST Log-Any-0.15.tar.gz 17537 SHA256 fbb24743d1b61debc490cb41f8f3f1e865379c8b52dacb419f10ff03d02b1cb2 SHA512 4f1919c64ca5bbb2773369ab44ef972272926554b37f95d31a8dbd1f11da730307b55023eba1396c608ce194c70a83afe59034c116fa2c5817b7037222948869 WHIRLPOOL 66624c84f20458500393a521a7f618fdecef016e74af727c09189f1708793a3aaba76ca645ef19fa4648de27c2531f2c8fb7e9f10d148c9b6ad3d104249a5521
 DIST Log-Any-1.032.tar.gz 39824 SHA256 808558fa42aa96365ed0af773973a5618b4ad50511d81fc7548f67133efdb956 SHA512 e7539f402c30637cb5b3935b7967130c4ecadb0bfdc35252740ab9f626c0c7752323f0bc0eb3b0530458570a5710ac8d845e48b8ea8e0517dc10b41077ac5184 WHIRLPOOL d54f1476b2a4676525d728811f02d2340a9945dee38ba3b5038d3ced9232e4cb1f89dc19e0f219f01a701aac60624c9051d4241b5e33266b304d59deff45e365
+DIST Log-Any-1.038.tar.gz 41707 SHA256 09a07da9b797efa114096e2ea26287d19f22cfae5ac4d135c1be7ab5da94e220 SHA512 36c8370d3924ee9cc85f2be5fe9d8212e7148b98392df90ef8e5566aedf12050115029434d9d969c1582c43a755fb540268dce73390ea53e8918f2901e25e62e WHIRLPOOL 055df7a42d7424eca9162da656b65c0f37cf16c3c355836aefcaf0357afdf2450f63b500db350a86facae291fa9c00314b5d5681e12a35818713dcbf624282c3
diff --git a/dev-perl/Log-Dispatch/Log-Dispatch-2.540.0.ebuild b/dev-perl/Log-Dispatch/Log-Dispatch-2.540.0.ebuild
new file mode 100644
index 000000000000..0bd55d53cb18
--- /dev/null
+++ b/dev-perl/Log-Dispatch/Log-Dispatch-2.540.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=2.54
+inherit perl-module
+
+DESCRIPTION="Dispatches messages to one or more outputs"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix"
+IUSE="test"
+
+PERL_RM_FILES=(
+	"t/email-exit.t"
+	"t/release-cpan-changes.t"
+	"t/release-portability.t"
+	"t/release-pod-coverage.t"
+	"t/release-tidyall.t"
+	"t/author-eol.t"
+	"t/author-mojibake.t"
+	"t/author-no-tabs.t"
+	"t/author-pod-spell.t"
+	"t/author-pod-syntax.t"
+	"t/author-test-dependents.t"
+	"t/author-test-version.t"
+)
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Devel-GlobalDestruction
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-Encode
+	dev-perl/Module-Runtime
+	virtual/perl-IO
+	>=virtual/perl-JSON-PP-2.273.0
+	>=dev-perl/Params-Validate-1.30.0
+	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Sys-Syslog-0.280.0
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Data-Dumper
+		virtual/perl-Exporter
+		virtual/perl-File-Spec
+		virtual/perl-File-Temp
+		virtual/perl-Getopt-Long
+		dev-perl/IPC-Run3
+		virtual/perl-IO
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Test-Requires
+	)
+"
diff --git a/dev-perl/Log-Dispatch/Manifest b/dev-perl/Log-Dispatch/Manifest
index fc8c1449141e..8f613179deb9 100644
--- a/dev-perl/Log-Dispatch/Manifest
+++ b/dev-perl/Log-Dispatch/Manifest
@@ -1,3 +1,4 @@
 DIST Log-Dispatch-2.41.tar.gz 35285 SHA256 3f81fa068a2d68b0d13243a874da765ffb728a9d26ed44ef088ca627faa4556f SHA512 5ce6c1d9549583d6e8927a3e3bc1f4b2d37e7705edd10ea05039ea5fc12ea3b01b49cb9d863bccadb373e6522b973b5189125e2a91a824fdb5dbec2b5d9c6d7c WHIRLPOOL 92d6313adae51a1da0533638da0eb9e4e569aa2d6601d9b372e3eccc69bcb20fa1853e726548a663aa7cfc1251d9a2951ad83f66903a2cfdfb16409d51db82fe
 DIST Log-Dispatch-2.45.tar.gz 52537 SHA256 707fc17d1f072150b87d400e5994b46ae2083a7120a9d21d37680ade08084bd6 SHA512 c4b82c408ffa8b5b9681b8b3eea90dc2cb95639a65f568ca977068bf30b087f7e29fdc2a80216770e07774c39744fbf6810faeac4786a3a183764bbe15d70f76 WHIRLPOOL 6e9043477bed42afa6412e2cfc2c0330ad2971edd88fb781f8c4a1b27254bd1162d651e752aab6c0563786721975ac0c4a8ce42a93d536925b882eda08149141
 DIST Log-Dispatch-2.51.tar.gz 56576 SHA256 c7dad8cdb7f242f5663fd49ee848c4345dd35fc609ed98a2c00c75d23ca6fac8 SHA512 5dcd37c48a58e9c2dfe3f18108c4d902a9e46c710eb519958f1f3347e8794bda2c7f34895bf54e47695f77a89bfd96ca887b72f05173dc7e70ee2698f8e3c313 WHIRLPOOL 064d359c6891b9c9fcbec4ec351a1c34c61b2800761ac43b33c2db8505b2482d41911f6df5857f29b804385e133237367258d230e36a09d28ce794295681b609
+DIST Log-Dispatch-2.54.tar.gz 59316 SHA256 7c365b8cdd2712cb642421773665d67a0a190cc6b44d19b804671c7631193f81 SHA512 67dd4bf15899fa441ecd725305b443873c77fcf8eeff44e53408637f81dc14c3375bdf52514214c111d1692a7087efb929ecdc411771dd413fef10bb034dc45b WHIRLPOOL fb0a86477f31e27db217e238fe9b27f923e1cfef71861969093e6bdd55b1bfb9acb5ac01a2372b771257311d85ad3ab82d668baeffe3150efb33a5f2690966e6
diff --git a/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r1.ebuild b/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild
similarity index 92%
rename from dev-perl/Panotools-Script/Panotools-Script-0.280.0-r1.ebuild
rename to dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild
index 9fd221c4fc49..e59dff2a7d98 100644
--- a/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r1.ebuild
+++ b/dev-perl/Panotools-Script/Panotools-Script-0.280.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ IUSE="gui"
 
 RDEPEND="dev-perl/URI
 	dev-perl/libwww-perl
-	>=dev-perl/ImageSize-2.9
+	>=dev-perl/Image-Size-2.900.0
 	>=media-libs/exiftool-6
 	gui? ( gnome-extra/zenity )"
 DEPEND=""
diff --git a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild
similarity index 80%
rename from dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild
rename to dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild
index a8dee6fc0f01..4cdc9b6145d0 100644
--- a/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r1.ebuild
+++ b/dev-perl/RTF-Writer/RTF-Writer-1.110.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND="dev-perl/ImageSize"
+RDEPEND="dev-perl/Image-Size"
 DEPEND="${RDEPEND}"
 
 SRC_TEST="do"
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.22.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.22.0.ebuild
index ecabf61b1183..bfcf6a72fafb 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.22.0.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.22.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-libs/xapian:0/1.2.22
diff --git a/dev-perl/local-lib/Manifest b/dev-perl/local-lib/Manifest
index cd323f95b630..7c3f25e892a4 100644
--- a/dev-perl/local-lib/Manifest
+++ b/dev-perl/local-lib/Manifest
@@ -1 +1,2 @@
 DIST local-lib-2.000014.tar.gz 51593 SHA256 ae63356ab780c5a3aa46287b48daea748a3dd021d9b52dff8bf480b43787fa2b SHA512 3a7bb68af992215eb6787082fea7c09d5468aabe5c6478d028ce99ae878f6efdd8982804ba2c396af1fc0a5b46a4fa7f0e4831d9c32f1abd41ef631976c5efe8 WHIRLPOOL 990e3ca60a88544a0394fbb994832aff9c50988dde0372d8d7e437a72c28d30bf27438acfb8423aa57965bf58140e7a3284d6151a80cbd51bffc4ed201b6e6c1
+DIST local-lib-2.000018.tar.gz 59350 SHA256 9ba8f5d55a03e029c3e18799942b89d2c457bb4414b9dce912dc1c8797d94894 SHA512 d94672b623de5c4e99270733a4de59f95c01b3c89cd552da05b04892893696cf57c9988b695cca2eda624a2c48bb392fe51d17eb842ed09e0824d71fcb4eb80e WHIRLPOOL df53e7ae77cf6758b69bfc3291c7b4a77c030c2ae428123a93ce3a4fcd460d70be33f2b8bf8bfa6b20f12eb109707a58863adcf44c7bfeddafdec6f06557bb70
diff --git a/dev-perl/local-lib/local-lib-2.0.18.ebuild b/dev-perl/local-lib/local-lib-2.0.18.ebuild
new file mode 100644
index 000000000000..22265b4ddd04
--- /dev/null
+++ b/dev-perl/local-lib/local-lib-2.0.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+DIST_AUTHOR=HAARG
+DIST_VERSION=2.000018
+inherit perl-module
+
+DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-CPAN-1.820.0
+	>=virtual/perl-ExtUtils-Install-1.430.0
+	>=virtual/perl-ExtUtils-MakeMaker-7.0.0
+	>=dev-perl/Module-Build-0.360.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-php/PEAR-PHP_CodeSniffer/Manifest b/dev-php/PEAR-PHP_CodeSniffer/Manifest
index ff10dcccedd7..cefdc889b878 100644
--- a/dev-php/PEAR-PHP_CodeSniffer/Manifest
+++ b/dev-php/PEAR-PHP_CodeSniffer/Manifest
@@ -1,4 +1 @@
-DIST PHP_CodeSniffer-1.3.5.tgz 345113 SHA256 deb28c23ae83962aaefaeb022b55de4045c83ab962a430f603464564f4e8fb5e SHA512 2502636bf9273fee02d8b7ed26ef80754672f1d07418b5337c6e814ed783ed73ab2f1fc14d6c9192d15ef4260b8bb54e68ce6d028cc7167da88a8b4b9bcf5a28 WHIRLPOOL 7dba786a1cfb1f66587a26c0961c68f63226b2d8e1a5a22126691635ab3314e387d94985f6f30b06c4e009b9014726fd2d594a8edf2830010e30f4cc44633998
-DIST PHP_CodeSniffer-1.4.7.tgz 406387 SHA256 c3f44b80d7853f521f333486c3c1d6cda5caea6b1f14b0679c41b1c7169bf550 SHA512 5cef6054190f65f8ec8750b00bf1c5c4e14ee6c3174cc98202722b84834b0367c2c7657fdc9e33f4311278f1d37738ab8f9579b730a1db30c0196ad53dbfa285 WHIRLPOOL b63c369ac1b6126f7abff969a4d9061b39cce9856c9b2a729bd5e73c5b9cbe27c150679a7649775d90fc8a008a693f201bf984b4c63b4410377b357c16cd2829
-DIST PHP_CodeSniffer-1.5.0RC4.tgz 404735 SHA256 02677d8ceb82a88332fb9748fcd16e588c58a1e7584d53713a37d29a0214a7ce SHA512 495b69ddfa73ebc7b78966a81f3e529d33729170e383bb2ec241e6c711fc1b7d80f46221a015b7b5e8ef0524e76ee667a98de604333a095c4a2045784202e8cc WHIRLPOOL ab0960bcc7c38ffdfd70a8beb34cab188e0f013b23c121165760e9796db4528354bd1feb6da4c080e974039910afe036333c0907ccbfdac0405f5a8514e36bc1
-DIST PHP_CodeSniffer-2.3.0.tgz 464453 SHA256 ee4774d96da65d907c36ceabdefc2a8dbc95cabcee0457b78a418357553c5611 SHA512 c0f8ec79e41301619b2c9f5c4145bbc6705b01c9cf6f954448679e8d2bee2ce6cb759a0cd799f925f70e43304e7f2dc9f412cc51fd7a25fd002d56bf408b6ba2 WHIRLPOOL 33358e1631099fbafa4ac77f3a7e5a6c10186aa6e43fd231e22c51c94d70c1c2dddde2621b5435c23e06a9392c0e68b71f899de301eeca23f4da41944f04e5a2
+DIST PEAR-PHP_CodeSniffer-2.5.1.tar.gz 294006 SHA256 bd38bddea81eb9b13413fb09c382a10bbd3c3d8bf82539ac4cc3f1e6a334e5ca SHA512 20221e45da087bbd4e34817086e67ec87016d24a0f14bafbcd7b2a82d4ead9ecf18f2053685e7eee33b5cb4ae2a6d19588b2ca35908b01b75fa79589bbf46671 WHIRLPOOL 0e3b6fe239a6a6e653bf0478edc3eadd05fad456e69785d6f893890cd0a00c066f3eb186c5081142579e0df1a21d7e89f089c93ba4d9810fa235532c318f6a6a
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild
deleted file mode 100644
index 11191d21c11d..000000000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.3.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.4.7.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.4.7.ebuild
deleted file mode 100644
index 11191d21c11d..000000000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.4.7.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.5.0_rc4.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.5.0_rc4.ebuild
deleted file mode 100644
index b81d24579590..000000000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-1.5.0_rc4.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit php-pear-r1
-
-DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.3.0.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.3.0.ebuild
deleted file mode 100644
index 462a782d15e2..000000000000
--- a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.3.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit php-pear-r1
-
-DESCRIPTION="Tokenises PHP code and detects violations of a defined set of coding standards"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=dev-lang/php-5.1.2:*[cli]"
diff --git a/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1.ebuild b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1.ebuild
new file mode 100644
index 000000000000..8710e75a87ea
--- /dev/null
+++ b/dev-php/PEAR-PHP_CodeSniffer/PEAR-PHP_CodeSniffer-2.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Can go if we ever drop the "PEAR-" prefix.
+MY_PN="${PN#PEAR-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Detect violations of PHP code standards"
+HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
+SRC_URI="https://github.com/squizlabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( >=dev-php/phpunit-4 )"
+RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
+
+# Can go if we ever drop the "PEAR-" prefix.
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+src_install() {
+	insinto "/usr/share/${PN}"
+	doins -r CodeSniffer CodeSniffer.php
+
+	# These load code via relative paths, so they have to be symlinked
+	# and not dobin'd.
+	exeinto "/usr/share/${PN}/scripts"
+	for script in phpcbf phpcs; do
+		doexe "scripts/${script}"
+		dosym "/usr/share/${PN}/scripts/${script}" "/usr/bin/${script}"
+	done
+
+	einstalldocs
+}
+
+# The test suite isn't part of the tarball at the moment, keep an eye on
+# https://github.com/squizlabs/PHP_CodeSniffer/issues/548
+RESTRICT=test
+src_test() {
+	phpunit || die "test suite failed"
+}
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 5918ed64da24..609c04e55905 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,3 +1 @@
-DIST PyGithub-1.25.0.tar.gz 2514171 SHA256 bea24a94b8450161efb258257342617617e5582b70419224ee0e436c6a410110 SHA512 02245bf3f75a6144d1632f1eb27b13e719042ed66eaf8540a966b75ec880322a062490d6c3cd0e65599af613add59862201964955f2ff0e3fee75ea46f1f35b1 WHIRLPOOL 5ed09fa21d633e4ca07c5c71870948c1ab90fccfb2caf73178af183b81cfcc45ca95ae4050e3c9ea39fffc9efbca559042d730a8ac2348952cfa49ea5bbcb9e6
-DIST PyGithub-1.25.1.tar.gz 2514716 SHA256 6c39a6077e08f2f266039c5184911fc30c7b90a42f875fe98d7cef52a7aa8afa SHA512 5e17de013465ec2452d0c3018d83c000e3cd90d3a9a0590e409769438321035140fccc2aa10468a116573b374552232dac69b96189ae3627f2399289fba77287 WHIRLPOOL a8aef2edad109edbe8b0ab3272ad39f235b90f425b18ec7ac5e822a9d05838f6514320e2fdc46195cf4a5dbb0141b044e0fc2a2ebbd5aa03ae87c68edcbbbbdd
 DIST PyGithub-1.25.2.tar.gz 2624603 SHA256 3afce80516998ce4478424797f341d961d1c251958859c70b8d3986d00faafd7 SHA512 24b8370552889e748de1f51e6d5a14f11e2f77a9b1f920743f90ffbadc849cb887bf6d84c1c251b7a86ee454d919004255fc3046b199792cd078ce49d892cec0 WHIRLPOOL 56d7989c63f0b0943da3c88e38ec266277659f124566ab20c9a9f30ceec74c792d4f13cc201d7b7851ac3074c05f5608280674803597652913f0a1b71f430505
diff --git a/dev-python/PyGithub/PyGithub-1.25.0.ebuild b/dev-python/PyGithub/PyGithub-1.25.0.ebuild
deleted file mode 100644
index c09c5b9eaf62..000000000000
--- a/dev-python/PyGithub/PyGithub-1.25.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 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="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/jacquev6/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/jacquev6/PyGithub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/PyGithub/PyGithub-1.25.1.ebuild b/dev-python/PyGithub/PyGithub-1.25.1.ebuild
deleted file mode 100644
index d292169d4fc9..000000000000
--- a/dev-python/PyGithub/PyGithub-1.25.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 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="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/jacquev6/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/jacquev6/PyGithub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index ba2cf3057c7f..265666a9e3f6 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,3 +1,4 @@
 DIST click-2.0.tar.gz 47342 SHA256 33a984fe73aa8c6bf69c38098b69dd38405529db54baf4c8cf64c50b2dee644f SHA512 4c703ab4b5c76e393420b0edf9af9e8ddb301ccfef5f8117d3408eaa8a94abe6b7b5c7a8b61b7774a3b459b153c10438e8934f21ceb73697199828cce2c2887c WHIRLPOOL bf599395245319b31c189df297a1ec35ca69723ed24e2d3e9aa9231a3cfebdb80e1f43a0b010865b6fbecf09f23dc1121cca232aec26f09bdb455f41da5261c4
 DIST click-5.1.tar.gz 275592 SHA256 678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a SHA512 b860b0227644f5d1cc24d41e66985421ec971f11f3f596fb46508fdc787200b949e7ef29b2035421ebb0115384688da03c3c95a0d6acc58dd3b566b32a2b7c6a WHIRLPOOL 8bda8de886a272972595bf51af3881962063daaa4fc9e104af59b4798008a2f780c3fb4a758d7fe14ef075b92aecc43415b08bb213cbd6ac4ab92a56e405276e
 DIST click-6.2.tar.gz 281717 SHA256 fba0ff70f5ebb4cebbf64c40a8fbc222fb7cf825237241e548354dabe3da6a82 SHA512 3950bd4e05823dbd526b3e3d17f9eb6871e1591342bdc4d21b7d4cea8f66791b1ab1d79ec664dae55cfbeaa5086fabb0db596bc88593251002c6584eae823477 WHIRLPOOL a53c5be5510e485f51682de0f13abadadc6627eda1ef0a9e55d2e7fe78a1fe79ba200c4172d47674d08d103b9b83dacb18da3ff8ddc09ad8e781503b87d5ceaf
+DIST click-6.3.tar.gz 283062 SHA256 b720d9faabe193287b71e3c26082b0f249501288e153b7e7cfce3bb87ac8cc1c SHA512 c7518b9c595fe35efb6be4391006a471cdc909f6725b9b3c45b06ec7b8b24560543ee151ff3afabc76ea23f4367795c4e5ace9b4b780c18c48a3e512474e3bf8 WHIRLPOOL 252ddf31265a2ed4eecc616ac94a7e0c32438c204729bff7e57b0ec850dd02004c76751934202f9de3bb4dc5811dfd10cb05f50d7e4a465dcc752438176c8ecc
diff --git a/dev-python/click/click-6.3.ebuild b/dev-python/click/click-6.3.ebuild
new file mode 100644
index 000000000000..6c9a3dcf7389
--- /dev/null
+++ b/dev-python/click/click-6.3.ebuild
@@ -0,0 +1,49 @@
+# 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} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc examples test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+pkg_setup() {
+	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index 3fa7ed79227d..578364e24585 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.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,7 +10,6 @@ inherit distutils-r1
 
 DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
 HOMEPAGE="
-	https://code.google.com/p/colorama/
 	https://pypi.python.org/pypi/colorama
 	https://github.com/tartley/colorama"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/colorama/colorama-0.3.5.ebuild b/dev-python/colorama/colorama-0.3.5.ebuild
index 9ce4094085d6..ae0dd9954b91 100644
--- a/dev-python/colorama/colorama-0.3.5.ebuild
+++ b/dev-python/colorama/colorama-0.3.5.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,7 +10,6 @@ inherit distutils-r1
 
 DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
 HOMEPAGE="
-	https://code.google.com/p/colorama/
 	https://pypi.python.org/pypi/colorama
 	https://github.com/tartley/colorama"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/colorama/colorama-0.3.6.ebuild b/dev-python/colorama/colorama-0.3.6.ebuild
index c3dda578db5b..7cc88846d36b 100644
--- a/dev-python/colorama/colorama-0.3.6.ebuild
+++ b/dev-python/colorama/colorama-0.3.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
@@ -10,7 +10,6 @@ inherit distutils-r1
 
 DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
 HOMEPAGE="
-	https://code.google.com/p/colorama/
 	https://pypi.python.org/pypi/colorama
 	https://github.com/tartley/colorama"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -20,6 +19,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
 python_install_all() {
 	use examples && local EXAMPLES=( demos/. )
 	distutils-r1_python_install_all
diff --git a/dev-python/colorama/files/colorama-0.3.6.patch b/dev-python/colorama/files/colorama-0.3.6.patch
new file mode 100644
index 000000000000..65a9476d175c
--- /dev/null
+++ b/dev-python/colorama/files/colorama-0.3.6.patch
@@ -0,0 +1,32 @@
+diff -r -U2 colorama-0.3.6.orig/colorama/ansitowin32.py colorama-0.3.6/colorama/ansitowin32.py
+--- colorama-0.3.6.orig/colorama/ansitowin32.py	2015-12-14 09:09:52.000000000 +0100
++++ colorama-0.3.6/colorama/ansitowin32.py	2016-02-23 13:52:37.230415139 +0100
+@@ -14,4 +14,8 @@
+ 
+ 
++def is_stream_closed(stream):
++    return not hasattr(stream, 'closed') or stream.closed
++
++
+ def is_a_tty(stream):
+     return hasattr(stream, 'isatty') and stream.isatty()
+@@ -65,10 +69,10 @@
+         # should we strip ANSI sequences from our output?
+         if strip is None:
+-            strip = conversion_supported or (not wrapped.closed and not is_a_tty(wrapped))
++            strip = conversion_supported or (not is_stream_closed(wrapped) and not is_a_tty(wrapped))
+         self.strip = strip
+ 
+         # should we should convert ANSI sequences into win32 calls?
+         if convert is None:
+-            convert = conversion_supported and not wrapped.closed and is_a_tty(wrapped)
++            convert = conversion_supported and not is_stream_closed(wrapped) and is_a_tty(wrapped)
+         self.convert = convert
+ 
+@@ -146,5 +150,5 @@
+         if self.convert:
+             self.call_win32('m', (0,))
+-        elif not self.strip and not self.wrapped.closed:
++        elif not self.strip and not is_stream_closed(self.wrapped):
+             self.wrapped.write(Style.RESET_ALL)
+ 
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 53ea9c595575..1fffb9aed488 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
 DIST google-api-python-client-1.1.tar.gz 71178 SHA256 bc88cae1c40446f22d58923fc5a8dbac77da29d6efbe4ae2276cc2f30f724617 SHA512 750c482e90f83d0b2d53f7d655db9a476686158b5e380cab7a5e92af1b521b26871dcda08a2ee946cd09035f65ca50ad8dcffa8f766d3671fceae009fbdb831e WHIRLPOOL 62d2ebb7f51f58c76b45f748fe79b031cda5f11fd6088d8ea947e7ab9b9b754688e004773f99169cc65fdd2789002faa486bed7717fc07dea0b25994cbede0da
 DIST google-api-python-client-1.3.1.tar.gz 1480269 SHA256 5137c4d6e853cda1a2e32b7f1b1ce28b66f5d62e464d91386be22492c276b1f8 SHA512 385377bd99f006154f90bed2b6f55cb25786032d28ac7f15b9859882670cc8bf94acbfbd8485c4cf89abd665908f1a7f46f74e84f05faba992a62fe4b9fd5bd1 WHIRLPOOL cda6825e502738f6d3035e524494aadc159ac8d41ae12d3f682236f8c344dc41e2ecf03aee6b247233c5b9aa8c756ac8d598c98c95333dc8a8929901c3a82327
 DIST google-api-python-client-1.4.2.tar.gz 2289731 SHA256 dfb7feab9733ae99952545927b5d87dda24cea308b2040fba2c505e7f0c57696 SHA512 ab5ce56142d96ed9b38d00294133e188dfeaf70aac78054f093f03fce7c4aee5b7b99f18ee27190aaef14b7fbe2bc8d0a4e2526ff6f166e41eb0b4b050e7c6b5 WHIRLPOOL 006e24d1a4e5d2bfabcbf2503fa163d6b0a3a28a839396014bf0a91a463454f02140f38dd179a141010a03e268711c2d22c9aa3158b594e5b465d9032997e7b9
+DIST google-api-python-client-1.5.0.tar.gz 2683924 SHA256 1558d6a6bca8c4ea775be46c6a81364739dc35b7ad2afc660c3a3102a43165bb SHA512 082a89e2e52dff449b6c4b6800503e337c5f2aa7ea2ca45a8373743a312d18d24ad87a486aed77b2e26075ba897f36e1129852dc30a139750e75cce5a1c25aa4 WHIRLPOOL f306a91fda8f241774a0b121dd8741ed5342aafb920b1bb59ca46a296ac7eaee4072839480abcd592a52d92e01811b9032545f93e8528211edf51d0cbe07644b
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
index 45576f2e3280..fd1a0b7f4ca7 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.3.1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.3.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$
 
@@ -20,7 +20,7 @@ IUSE=""
 DEPEND="
 	dev-python/python-gflags[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	dev-python/oauth2client[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-2[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/uritemplate[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
index bd55bbb1a890..cf07c4f8e4be 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.4.2.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$
 
@@ -19,7 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	dev-python/oauth2client[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-2[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/uritemplate[${PYTHON_USEDEP}]
 	"
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
new file mode 100644
index 000000000000..aef0fa73123e
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.5.0.ebuild
@@ -0,0 +1,43 @@
+# 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_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2[${PYTHON_USEDEP}]
+	<dev-python/oauth2client-3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-0.6[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all(){
+	export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 || die
+}
diff --git a/dev-python/gst-python/gst-python-1.6.2.ebuild b/dev-python/gst-python/gst-python-1.6.2.ebuild
index 880e55289764..81aee5dd3f23 100644
--- a/dev-python/gst-python/gst-python-1.6.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 2f7720df78f2..61926296d9dc 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,6 +1,2 @@
-DIST humanfriendly-1.33.tar.gz 34362 SHA256 158259d5cb9b762fb094a3cbbade70b5e623568b92c3765d1914fa87f5bf4ecc SHA512 878dc081b15df2f1d682697b9abde45ea20aebd4a33bd7079af7eb3c86b331ad2135b7153b6727ddadbc2146fe042d5a860aaab4889a637622636d4118179bf5 WHIRLPOOL c57a7404341cff1eca80069e35350b99ddf3c26b68894ab283d39ad4dd80fbd2014f04a8dfdb040aae432c4b2ed9bdc51f0085d743575c78eddcc9985cf3cbed
-DIST humanfriendly-1.35.tar.gz 36181 SHA256 de030bb1976b526f514c9a953c38286f50c3ece01180a1efdda56f091eb33164 SHA512 3cec8629423f640b2b6bdcf95aa8346daf88268b3d7e9ce44be395f7e9f3aa1a23d27d422db3bfda32e1e6c2c6a2eaf8dc1393ef6fcea4895ef6b44671353d0d WHIRLPOOL c44a897a81b2044a9d6913fb1d74d6979534d00cce486035b23facbc5595532996cb19c8b34cd7768381e67ff277b6ed02c034341958f4eff63940136cecaf27
-DIST humanfriendly-1.38.tar.gz 41228 SHA256 1706a6e72c28d4001d2f2c963e74d120d36b9b9047e4026c0909f37b3da5e558 SHA512 2409e00ab9a50537a9ef03216a1e3e31f503a879afdf1b642a63f68e0a839a58d90610548f5ba2db57d32ec8e7106ab160e64b212053dfbbedca00128c1f6fdc WHIRLPOOL 8d2a98dbd08381870464b0e1ff4817b34ec0ac85b321e6cf460bfded0047976c3639898bd5d3811f859fed40f368085be561dc2f61a720deb586a21c181f2398
-DIST humanfriendly-1.42.tar.gz 42222 SHA256 e64417fd2b7e9b1fa0c2264e03a289734c2c7692030059fc4d3a0440b1e87da3 SHA512 464209a84020c799282271bedd23b08c198f77cfe0e1f6175bec4d2b946a024d5fc4d550f5d79c76492f30b73a105484a84faaea4f6602905e289dc5ae5a19c0 WHIRLPOOL 50fdc7166be36df430f626fe4ba6024e2158f5a1345e3b82086e46adb4b78ca5ac861719a6c139d30096c09651f7173176a63d776f60a9cceb86badcfd9781a3
-DIST humanfriendly-1.43.1.tar.gz 42052 SHA256 f0bb35005ed6d873e62bae51edb7ecbff87b9238f9733d40e83c6cd3dda43c8d SHA512 82e6dcf9a0b715a2fc20901f1977764ca2490ed6cc647b401405766fce573c9677fbfe159a181b90ca13a6e222fcfaf52aa887bc9646e3e28ee368a1ab714fdc WHIRLPOOL e5af350534793ec745c61034072412f9203dad123e593202dea080f618d8136f97fc0f93a9955b93c844e0fbfc085296856b2899d86ab5c9742bd745ab9dd695
 DIST humanfriendly-1.44.1.tar.gz 44281 SHA256 a9c545dc284c8e310465dba0b2300d898a9dc0d6eba5852f7578e03ff3ffc4ea SHA512 d5467e75c2e84c50dacaaab1c14b71a536eda5b91f4fc2d6ca69f1f1e50fe0ac215ac6cbf91cf7df08456f3058dcf84f0e38f611022c295e90c936e3b8a77cc9 WHIRLPOOL 869f86cd719fb9f3810767a37f43742ff21e9664229ccc4525873c84288fff8e9f08530796f54f2f1bea3b2df0601a424c5a253a42940c2d6a99cdbe19b20627
+DIST humanfriendly-1.44.3.tar.gz 44682 SHA256 910a01f17d73536d53f0464c3d825e64efcb56fff80c58b383b78bfab5f934d0 SHA512 7ddba207e9946ea38ec7d4aaebe87c38ae7cec0f87d7576a8e99425f9678e7b90d830de2518ba898ba485d86e4b363022a9919dbf4fdf0b6cdd4bcf1629cd1b5 WHIRLPOOL 58683b1085e92d0d9c24a9b31c189f20a6d04f9a0eed8369ef180d0e0e66bcf878c251d61dcce905ad53223b480e1d244ff239d56b5a13d730c48952ec85007a
diff --git a/dev-python/humanfriendly/humanfriendly-1.33.ebuild b/dev-python/humanfriendly/humanfriendly-1.33.ebuild
deleted file mode 100644
index 075b98f92cae..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.33.ebuild
+++ /dev/null
@@ -1,27 +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 python3_{3,4} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.35.ebuild b/dev-python/humanfriendly/humanfriendly-1.35.ebuild
deleted file mode 100644
index 075b98f92cae..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.35.ebuild
+++ /dev/null
@@ -1,27 +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 python3_{3,4} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.38.ebuild b/dev-python/humanfriendly/humanfriendly-1.38.ebuild
deleted file mode 100644
index da61ac5951f0..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.38.ebuild
+++ /dev/null
@@ -1,31 +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 python3_{3,4} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-	)
-	"
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.42.ebuild b/dev-python/humanfriendly/humanfriendly-1.42.ebuild
deleted file mode 100644
index 5cb6cda8b903..000000000000
--- a/dev-python/humanfriendly/humanfriendly-1.42.ebuild
+++ /dev/null
@@ -1,31 +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 python3_{3,4,5} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/capturer[${PYTHON_USEDEP}]
-		dev-python/coloredlogs[${PYTHON_USEDEP}]
-	)
-	"
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/humanfriendly/humanfriendly-1.43.1.ebuild b/dev-python/humanfriendly/humanfriendly-1.44.3.ebuild
similarity index 100%
rename from dev-python/humanfriendly/humanfriendly-1.43.1.ebuild
rename to dev-python/humanfriendly/humanfriendly-1.44.3.ebuild
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 4d02d6d6c59e..84335a48f877 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,2 +1,3 @@
 DIST ipyparallel-4.1.0.tar.gz 2271608 SHA256 c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a SHA512 19fff1ea57d9fcaec6525ce6e0c72ab63ab1245e32e485174a0691d2b48d8d2512af4055b77df82c7b30a8c071e1b6c5900d37e992f82f1597492e220e83d36f WHIRLPOOL ead35bc2166af0b221e730550689b09b7bf04148abcd754039f1c511acaa182ba50b593372f3e8bc627ae40a6117f9209cac476c1905bdc780f53de10666ffe1
 DIST ipyparallel-5.0.0.tar.gz 2286751 SHA256 ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a SHA512 ef04b717198246300ad1020eb7f9a65c40553a897653384bd839d5fb05409a276df41f933b0f023c0523fc6d8cebf6e2c6f8478c8be4fe4fdf386ad78b8f4418 WHIRLPOOL 677fd7fa2090b2b75c234c4802fab553105d2e3ce44ab4c390cadc56ba5ff3814005ab478906197d6a9f862e0d69901168d22cdc44c8063cf8e71fc8f8bdc449
+DIST ipyparallel-5.0.1.tar.gz 2350472 SHA256 48e319c16995a697c82e72dc4e5cb977be45cb0f0cdcfc482d5e8019ea6afeb2 SHA512 b7fa4f2ec5375398a533c92f07e2ab09180e537366c36ff5a7f3245d63072006ebcffc19dda28d08d5cc2e8a9044bf9101c7eeccf2857ed4a78ddd859ce23a2c WHIRLPOOL 350f67f7f341fe83bd21fb5f84714c43a426fa0d2234a532e781d0b0e9a977e2ee455184da995f5a3fbbf8e260d776dd9ac2607ac86041b5abecf41aeb9a8a9b
diff --git a/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
new file mode 100644
index 000000000000..8bf04a1ec2f5
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-5.0.1.ebuild
@@ -0,0 +1,58 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="http://ipython.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	!<dev-python/ipython-4.0.0[smp]
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	iptest ipyparallel.tests -- -vsx || die
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index 6893905474b4..9bee567df805 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -3,4 +3,4 @@ DIST oauth2client-1.4.12.tar.gz 109339 SHA256 f735b41a57fe46c0b170e919e81b9bbe7d
 DIST oauth2client-1.4.6.tar.gz 95325 SHA256 d4376fc0f5543612c62cdee5ea68530bd9c8542891b3f4427d8bf9a1f5a134c8 SHA512 e75e6c535ca4e427f3a869fa7e600bf7544752a100f623cbbeb117d872a2361a60d1524fc2639521393a58dc6f684d9e1452980d6a5ffb6f4dbed516911cc4ca WHIRLPOOL acb26ef17115138a8932313cbbb8c9a802e2296d20343ab746123ad0ef8a38ea8587c10c45863b56b7b4d5b052675434236a050ae64c6c05546a42fd3cdc4f6b
 DIST oauth2client-1.5.1.tar.gz 130237 SHA256 3e4ad7b3399cd9c4b8785acbbba2ca55eaefef17989f784352d2386776bf17c5 SHA512 ad228264b93ec23bfb4bbc9614a980172e3c763adde12e0b050166ccd49eece1d2464a078884ed16cbaea60a7bf88784a22314382073e360f1ec591b19a2da2f WHIRLPOOL 963b9518944dc081fdd3c32f1c6a12527a567f2c762355b109cee01b1cb1c1c35d85301bd2df6e47d2d11ac1e5b6c6a2bbc59098c10baa75ea2574567617f7ec
 DIST oauth2client-1.5.2.tar.gz 131665 SHA256 b8df20b122e4f49a5fe5bc3c825d16015f5012c171c6c81eb4048e4d8c2ffee3 SHA512 15f10b52aa93fc10289658d5ff671a247e5c92c5ff2be424a04617fee1a3a82439b829b0f5dcb04e3e84802e02580e366e08356df7ec6e24563a530d2f6b1db5 WHIRLPOOL 00f3033359eceda12528ef4caffc0a9d7d6561919272fe98e09d2599114f07d9be42eb32a4038c155c621581f98ecc0eb516bcaa018d4376e30906dd4a0adfbc
-DIST oauth2client-2.0.0.tar.gz 148575 SHA256 fc0ed9887399b640de58c5222f2d40be3c8b02359273be75105820ebf75082bd SHA512 4839f9ea6384fa19ee55ee953ef4e38211afd7e409a77658e535534632dd182aabb857cebc1969bcba5d80c63fa79f965a2c0b1bb2832975c1ed8dd3cd6d3042 WHIRLPOOL c418e89a9d5ef00928dae5e32aa90c664bff0b8b572ce09280ade26f764150ac42105041c3af494ad9a0ebaceb85c863be3b02c24b3216cb454e87e6e6744ac9
+DIST oauth2client-2.0.0_p1.tar.gz 149275 SHA256 0a4a9777f5c68a28605bb8510da0b09446ec3a4cb4d6e53ec9c2e240b357eb24 SHA512 e864c8e34757fa2e72b95d556c92549359be8e65fb709300c816090440ee6466ef6e638d67aaa5c0862d1d1e34caf5e4a9f565911cac05d186ef2c71b59aaf9c WHIRLPOOL 499097e9f7de89a76f73dd6fe631647e7d4f76716d64558c3c05c5d03e33ed1ee0183c5b2202347e99bcfd388767c199a31bc990d441bfb55e5df89685bee0a3
diff --git a/dev-python/oauth2client/oauth2client-2.0.0.ebuild b/dev-python/oauth2client/oauth2client-2.0.0_p1.ebuild
similarity index 88%
rename from dev-python/oauth2client/oauth2client-2.0.0.ebuild
rename to dev-python/oauth2client/oauth2client-2.0.0_p1.ebuild
index 1dc6d80900ab..74871a0ad417 100644
--- a/dev-python/oauth2client/oauth2client-2.0.0.ebuild
+++ b/dev-python/oauth2client/oauth2client-2.0.0_p1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
 HOMEPAGE="https://github.com/google/oauth2client"
-SRC_URI="https://github.com/google/oauth2client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
 
+S="${WORKDIR}"/${P/_p/-post}
+
 # Needs network
 RESTRICT=test
 
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 4ae1227d06ca..76e2f4887d73 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -2,3 +2,4 @@ DIST packaging-15.3.tar.gz 34359 SHA256 1e9a6b9ad621bc1dbd3aa8dfff52abc4b44f5c14
 DIST packaging-16.0.tar.gz 40167 SHA256 a32895134cd7b86ee8add60a3be5bfd7ef3f30e73e5b54221dbe67d0e0690689 SHA512 7672f0a51f73543e39ad80b021d288c0e235c2ace9add5022a1d494b2711ce55ba7d05d92245cbb96fa354d67fdfbdbdd2e1858ace3d6d2761869bc5ddaaeddd WHIRLPOOL be813ffbcc614e5be3bc9bb1e704e9c65c194b47172bb0c9bf0113ea8456256fa8263faec33b3e001b6d71ed7fd8763796afd6eeb608f3a65ea987db48304d5a
 DIST packaging-16.1.tar.gz 42929 SHA256 7792caf5bfda630c96310a84ecba5d61b17a843ab72194bb5606d81e4f44094f SHA512 f4e081be85247c989343e7532d5e4afcad68af960264b59271862799e8d63ed0b7fb733670f7446da69aa60f013fc886c8c31c6010c1157110c1a417209d9325 WHIRLPOOL 8c13ef4196633cc4c7c59aef2fa8980abc46908fd30ffbe79d565dcd6089bc1496a8b5dc6aa5968273281e8ef494ef54036c72192f36dfe30dbb0f3fcf8544c9
 DIST packaging-16.2.tar.gz 43398 SHA256 0eb4a6329c6d40a0deef725b4f510b6219ec8c365f888583babbb4454d761dd6 SHA512 2310efbd4d73498d5645d0c3a2f0cb162cd18cff28079ba2ac44b784e728363d84a8eae4d9e313c4491394841638ef01ef37ef7da3bac01e27af37a72e387dd1 WHIRLPOOL 5aff538bf5ee18474074048bb581140200c078ceb6366f5c709be931851b0835a8a725ecc17a1b2c34bae34cf79d8743a4422c6701e5c6e9ba99bfdc51aa439f
+DIST packaging-16.4.tar.gz 43707 SHA256 325db5b475511303f17e96047877bfc6ba9c895b6850df4a98d95bfbc0329cb1 SHA512 b237352589f8da122246a7222112934e53809c7a04051953c2fb49b2e8910b0ec675105a085187f608a334585d73348f180e855a2ccfa2d590dd38fa65260a70 WHIRLPOOL 4f9d0f20c7eeb0d1a9f3086c91df780bfff3d0062f69c08c6c70d4e288e83b79aa2ab38e9bbb82dbdc607c2b48e45760bbe53d390d4f431f714e63396d33c4de
diff --git a/dev-python/packaging/packaging-16.4.ebuild b/dev-python/packaging/packaging-16.4.ebuild
new file mode 100644
index 000000000000..26279ce494d2
--- /dev/null
+++ b/dev-python/packaging/packaging-16.4.ebuild
@@ -0,0 +1,47 @@
+# 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} pypy pypy3  )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	py.test --capture=no --strict -v || die
+}
+
+pkg_preinst() {
+	# Remove this in the next version bump
+	_cleanup() {
+		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
+		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			echo rm -r "${egginfo}"
+			rm -r "${egginfo}" || die "Failed to remove egg-info directory"
+		fi
+	}
+	python_foreach_impl _cleanup
+}
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index f2fb3818d1c3..57a1f06dc997 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}
diff --git a/dev-python/pyatspi/pyatspi-2.18.0.ebuild b/dev-python/pyatspi/pyatspi-2.18.0.ebuild
index 66f9f4429bab..7e7fb8c5d16b 100644
--- a/dev-python/pyatspi/pyatspi-2.18.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="" # test
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 6b41a39bacc8..31a2e75034b3 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -22,11 +22,10 @@ SLOT="0"
 IUSE="test"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	=dev-python/snakeoil-9999[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	$(python_gen_cond_dep 'dev-python/3to2[${PYTHON_USEDEP}]' python2_7)
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 		dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pygobject/pygobject-3.18.2.ebuild b/dev-python/pygobject/pygobject-3.18.2.ebuild
index cfd2ebb0b3df..1ed68961e5b3 100644
--- a/dev-python/pygobject/pygobject-3.18.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test +threads"
 
 REQUIRED_USE="
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
index 9646d87fb375..86b649ad63bd 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="app-crypt/gpgme"
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
new file mode 100644
index 000000000000..f9904bbb75a1
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -0,0 +1 @@
+DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 SHA256 927f4670b893d46e2f6273ae938bf0a1db27ffae3336eba94813ccef6260c410 SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61 WHIRLPOOL c758b777bf004384806a038f54df8394a032d1120ac6f4992bab1f26a86a466103d3ee4a331c22b2670e39c246dd662a250a9f34fa7719a7dfd0c9d43186b766
diff --git a/dev-python/pyopengl_accelerate/metadata.xml b/dev-python/pyopengl_accelerate/metadata.xml
new file mode 100644
index 000000000000..3c3d5ced6412
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/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>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
new file mode 100644
index 000000000000..bb120a073f97
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
@@ -0,0 +1,25 @@
+# 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="Accelerate module for PyOpenGL"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL-accelerate"
+MY_PN="PyOpenGL-accelerate"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index beada9109a8a..dde111bacb26 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1 +1,2 @@
 DIST python-efl-1.16.0.tar.xz 8737592 SHA256 3418ca7dc38f07bf610b9dcc7ce356bc8c45247a2100679bf840f640e2744e90 SHA512 6ee6f373b376af67af4124360482f7f0c2fb8b6e4c354ebba21c141a06be3f68ff17dcea45422c38d9e19595df035603df268aff74489007be6b9db13b861812 WHIRLPOOL 14cf92c31efae6a75de3d693075db8c3657519a60662db3373c8abef655d982f24e8ceddf10be605ec515b15d545ca4e2417767e3e48d68639e312f089bf2eff
+DIST python-efl-1.17.0.tar.xz 8835228 SHA256 9ea0fe0938bd4a970206b2b18f46f4d2a4fd1994e9b5f84af2d5f9fa98739179 SHA512 ff610dbacf72853b6c8fb1dcd41451f97156845efeb67a2d5d6c35d9b20c0f024c145a26a579f675bc2ad5844c23e58d8b21a09374aa195174f1a0c6316c0de4 WHIRLPOOL 0ee05c0cb175128c4719883a4c362ce4b3f98a93a7d960e47be2fa60a375748fc89599a111277d77a44caa9c96ad509d5b1c14c1ebafeb739461914560f2b4ed
diff --git a/dev-python/python-efl/python-efl-1.17.0.ebuild b/dev-python/python-efl/python-efl-1.17.0.ebuild
new file mode 100644
index 000000000000..a1ba58ee449f
--- /dev/null
+++ b/dev-python/python-efl/python-efl-1.17.0.ebuild
@@ -0,0 +1,62 @@
+# 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_4,3_5} )
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="bindings/python"
+	EGIT_URI_APPEND="${PN}"
+	EGIT_REPO_URI="git://git.enlightenment.org/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git"
+	inherit git-2
+else
+	SRC_URI="https://download.enlightenment.org/rel/bindings/python/${MY_P}.tar.xz"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Enlightenment Fundation Libraries"
+HOMEPAGE="http://www.enlightenment.org"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/efl-${PV}
+	>=media-libs/elementary-${PV}
+	>dev-python/dbus-python-0.83[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.17[${PYTHON_USEDEP}]
+	doc? (
+		media-gfx/graphviz[python]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	doc? ( >dev-python/sphinx-1.0[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	if use doc ; then
+		# Point sphinx to right location with builded sources
+		sed -i 's|"../build/"+d|"'"${BUILD_DIR}"'/lib"|g' doc/conf.py
+		esetup.py build_doc --build-dir "${S}"/build/doc/
+	fi
+}
+
+python_test() {
+	cd "${S}"/tests
+	rm -f ecore/test_09_file_download.py # violates sandbox
+	sed -i 's:verbosity=1:verbosity=3:' 00_run_all_tests.py || die
+	${PYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && DOCS=( "${S}"/build/doc/html )
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index cc3f3c2f67bd..a8b53e68c20a 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1 +1,2 @@
 DIST qtconsole-4.1.1.tar.gz 406257 SHA256 741906acae9e02c0df9138ac88b621ef22e438565aa96d783a9ef88faec3de46 SHA512 2848eb8d3a8816a47ca422b24837372899864e750336509f3d8444333d0783bae46b9917258cab14d4e09d91d5068a7772fb849a267e1a7d6e282c7c75e9f4e9 WHIRLPOOL 1a3a638be2bdea3f9ab6d625edd110ef698a84cfdf3b1f4101375faf8ed60a0e8e9ab6e297575dab8e2e6389107ba62a6bb338c78934780e19dd4c498aee9eb9
+DIST qtconsole-4.2.0.tar.gz 408331 SHA256 937314f4f35bde9ee28e97b199289f8ac1b1ba14e2a4e22ab8aafa17a1bae5b7 SHA512 bf8ab82b316961ecf14e56dda27bb1253e7e56b10adc7388b1a6a8548526a756da45a16b34e891e966dfa72cdd73a571390b23b9ed1e5d4cb684f2ba14569368 WHIRLPOOL 4ccb073c2d29ee1908696867af41c28c1cc51a2c30a7d2e030de7dacc0e069788d2f08756c6a22044fc58cec9d1df84fe1de10692d8d0eea0ffe31c9a6d64b66
diff --git a/dev-python/qtconsole/qtconsole-4.2.0.ebuild b/dev-python/qtconsole/qtconsole-4.2.0.ebuild
new file mode 100644
index 000000000000..7ea50addbcec
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.2.0.ebuild
@@ -0,0 +1,68 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/ipython-4.0.0-r2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+	)
+	|| (
+		dev-python/pyside[${PYTHON_USEDEP},svg]
+		dev-python/PyQt4[${PYTHON_USEDEP},svg]
+		dev-python/PyQt5[${PYTHON_USEDEP},svg]
+	)
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-13[${PYTHON_USEDEP}]
+	"
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# jupyter qtconsole --generate-config ... jupyter-qtconsole: cannot connect to X server
+	# ERROR
+	sed \
+		-e 's:test_generate_config:_&:g' \
+		-i qtconsole/tests/test_app.py || die
+	virtx nosetests --verbosity=2 qtconsole
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 3aad7ffffe69..e7bbcbb754f1 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,2 +1,3 @@
 DIST spyder-2.3.4.zip 3707063 SHA256 da4b13d6faed3e8810c0418f8274b26fde4f265ea4f93bee154af128a755c184 SHA512 7a4ea65ea06e9944094fc94db78327f9e23a8fd6dda5d0e9aa0e82ba4cd7d9f50b1eb837395a3fa2fabe814df873ad8ddbcca223144c47af4007b0493575e41e WHIRLPOOL 53e8f42bdafe01072457f27e45a279f92a198f181344f8267be2b3940cbd6d3743685ffe3264b04344f83bcb73b3eb8c9ec0e6bf8ccef26e19901324bfacb682
 DIST spyder-2.3.5.2.zip 3039104 SHA256 40e589467b561af534aac6d8cc2ea0dc244d3ae4457afb41b3aec6db6f8b2336 SHA512 ac8e078991b2889c3359e700bd89d4c8487eeba412512bc9bd7685214f687001bcc411016283bcde4eb73f6186ffc5cadc9614d911acd8b788899ef5aafd66e1 WHIRLPOOL e2b2bca44bd2ec1461875a358868ab34c60f30ac5164ff6312302b495e859000b97afc78ce12c69dbc328fdcbead247a9defce9e29c08de367fc7d3a321ff007
+DIST spyder-2.3.8.zip 3043528 SHA256 99fdae2cea325c0f2842c77bd67dd22db19fef3d9c0dde1545b1a2650eae517e SHA512 7d40e081ce2ea579d8d98e58e31b53afc04360bebcd52a226adc5ed387ed94d1aa24d0372c2e3594689d0f44a81df9986d8c3fbe4ccbae7a493ad039aaba3acc WHIRLPOOL dfd1edb2006c89df1a5bbc9d42a5e4e0042691fbcef71f855af6c0111f2b38bb88aef61ac00cfe8fed574e631af295aacb6d784d184ddb107e46616ce3a65e01
diff --git a/dev-python/spyder/files/spyder-2.3.8-build.patch b/dev-python/spyder/files/spyder-2.3.8-build.patch
new file mode 100644
index 000000000000..2a4646ab0c08
--- /dev/null
+++ b/dev-python/spyder/files/spyder-2.3.8-build.patch
@@ -0,0 +1,154 @@
+--- a/setup.py
++++ b/setup.py
+@@ -21,8 +21,6 @@
+ import shutil
+ 
+ from distutils.core import setup
+-from distutils.command.build import build
+-from distutils.command.install_data import install_data
+ 
+ # Check for Python 3
+ PY3 = sys.version_info[0] == 3
+@@ -66,12 +64,7 @@
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder3.png'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder.png'])]
++        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_light.ico'])]
+@@ -80,97 +73,6 @@
+     return data_files
+ 
+ 
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-# Sphinx build (documentation)
+-def get_html_help_exe():
+-    """Return HTML Help Workshop executable path (Windows only)"""
+-    if os.name == 'nt':
+-        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
+-        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
+-            if osp.isfile(hhc_exe):
+-                return hhc_exe
+-        else:
+-            return
+-
+-try:
+-    from sphinx import setup_command
+-
+-    class MyBuild(build):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + build.user_options
+-        def __init__(self, *args, **kwargs):
+-            build.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-        def with_doc(self):
+-            setup_dir = os.path.dirname(os.path.abspath(__file__))
+-            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
+-            install_obj = self.distribution.get_command_obj('install')
+-            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
+-        sub_commands = build.sub_commands + [('build_doc', with_doc)]
+-    CMDCLASS['build'] = MyBuild
+-
+-
+-    class MyInstall(install):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + install.user_options
+-        def __init__(self, *args, **kwargs):
+-            install.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-    CMDCLASS['install'] = MyInstall
+-
+-
+-    class MyBuildDoc(setup_command.BuildDoc):
+-        def run(self):
+-            build = self.get_finalized_command('build')
+-            sys.path.insert(0, os.path.abspath(build.build_lib))
+-            dirname = self.distribution.get_command_obj('build').build_purelib
+-            self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+-            
+-            if not osp.exists(self.builder_target_dir):
+-                os.mkdir(self.builder_target_dir)
+-
+-            hhc_exe = get_html_help_exe()
+-            self.builder = "html" if hhc_exe is None else "htmlhelp"
+-
+-            try:
+-                setup_command.BuildDoc.run(self)
+-            except UnicodeDecodeError:
+-                print("ERROR: unable to build documentation because Sphinx "\
+-                      "do not handle source path with non-ASCII characters. "\
+-                      "Please try to move the source package to another "\
+-                      "location (path with *only* ASCII characters).",
+-                      file=sys.stderr)
+-            sys.path.pop(0)
+-            
+-            # Building chm doc, if HTML Help Workshop is installed
+-            if hhc_exe is not None:
+-                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
+-                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
+-                if osp.isfile(fname):
+-                    dest = osp.join(dirname, 'spyderlib')
+-                    try:
+-                        shutil.move(fname, dest)
+-                    except shutil.Error:
+-                        print("Unable to replace %s" % dest)
+-                    shutil.rmtree(self.builder_target_dir)
+-
+-    CMDCLASS['build_doc'] = MyBuildDoc
+-except ImportError:
+-    print('WARNING: unable to build documentation because Sphinx '\
+-          'is not installed', file=sys.stderr)
+-
+-
+ NAME = 'spyder'
+ LIBNAME = 'spyderlib'
+ from spyderlib import __version__, __project_url__
+@@ -204,13 +106,7 @@
+     packages = get_subpackages(LIBNAME)+get_subpackages('spyderplugins')
+     return packages
+ 
+-# NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+-# platforms due to a bug in pip installation process (see Issue 1158)
+-SCRIPTS = ['%s_win_post_install.py' % NAME]
+-if PY3 and sys.platform.startswith('linux'):
+-    SCRIPTS.append('spyder3')
+-else:
+-    SCRIPTS.append('spyder')
++SCRIPTS = ['spyder']
+ EXTLIST = ['.mo', '.svg', '.png', '.css', '.html', '.js', '.chm', '.ini',
+            '.txt', '.rst']
+ if os.name == 'nt':
+@@ -246,7 +142,7 @@
+       package_data={LIBNAME: get_package_data(LIBNAME, EXTLIST),
+                     'spyderplugins':
+                     get_package_data('spyderplugins', EXTLIST)},
+-      requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"],
++      requires=["rope (>=0.9.2)", "PyQt4 (>=4.4)"],
+       scripts=[osp.join('scripts', fname) for fname in SCRIPTS],
+       data_files=get_data_files(),
+       options={"bdist_wininst":
+@@ -267,5 +163,4 @@
+                    'Programming Language :: Python :: 3',
+                    'Development Status :: 5 - Production/Stable',
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=CMDCLASS)
++                   'Topic :: Software Development :: Widget Sets'])
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index 57eeb9d98197..374a8a5dba61 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -22,6 +22,7 @@
     <flag name="pep8">Add support for <pkg>dev-python/pep8</pkg></flag>
     <flag name="pyflakes">Add support for <pkg>dev-python/pyflakes</pkg></flag>
     <flag name="pylint">Add support for <pkg>dev-python/pylint</pkg></flag>
+    <flag name="qtconsole">Add support for <pkg>dev-python/qtconsole</pkg></flag>
     <flag name="rope">Add support for <pkg>dev-python/rope</pkg></flag>
     <flag name="scipy">Add support for <pkg>sci-libs/scipy</pkg></flag>
     <flag name="sphinx">Add support for <pkg>dev-python/sphinx</pkg></flag>
diff --git a/dev-python/spyder/spyder-2.3.8.ebuild b/dev-python/spyder/spyder-2.3.8.ebuild
new file mode 100644
index 000000000000..2dd7841a1da6
--- /dev/null
+++ b/dev-python/spyder/spyder-2.3.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="Python IDE with matlab-like features"
+HOMEPAGE="https://github.com/spyder-ide/spyder"
+SRC_URI="https://bitbucket.org/${PN}-ide/${PN}lib/downloads/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc ipython matplotlib numpy pep8 +pyflakes pylint qtconsole +rope scipy sphinx"
+
+# rope requires no version bordering since all are >= miniumum version
+RDEPEND="
+	|| ( dev-python/PyQt4[${PYTHON_USEDEP},svg,webkit]
+	dev-python/pyside[${PYTHON_USEDEP},svg,webkit] )
+	ipython? ( dev-python/ipython[qt4,${PYTHON_USEDEP}] )
+	qtconsole? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	pep8? ( dev-python/pep8[${PYTHON_USEDEP}] )
+	pyflakes? ( >=dev-python/pyflakes-0.5[${PYTHON_USEDEP}] )
+	pylint? ( dev-python/pylint[${PYTHON_USEDEP}] )
+	rope? ( $(python_gen_cond_dep 'dev-python/rope[${PYTHON_USEDEP}]' python2_7) )
+	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+	sphinx? ( >=dev-python/sphinx-0.6.0[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( >=dev-python/sphinx-0.6.0[${PYTHON_USEDEP}] )"
+
+# Courtesy of Arfrever
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build doc doc/html || die "Generation of documentation failed"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	distutils-r1_python_install_all
+	doicon spyderlib/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+}
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 155af41440a5..039976f8c44a 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND=""
 
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
index 0fcecf64b9ef..a536272a8cd0 100644
--- a/dev-python/twitter/Manifest
+++ b/dev-python/twitter/Manifest
@@ -1,4 +1 @@
-DIST twitter-1.14.3.tar.gz 39538 SHA256 497fce2168cb57d5651932a39b70fc0c9304bebd53558107995102bca49210da SHA512 821af749b34d01319630388cb287af88f1e516d8d6117088e63d988cf2a397a70c2770df2e1f208bcfa9a18224aae98e7c2a6bb62b4fc8653e2bceed7f39a92c WHIRLPOOL 6ec6fa7a124aeceedc5a58a89f7ff5a6fed6d6f09993dbb3e581b7ef55810440390b8d8b22e4139aa7a770f203c065c2a75a149ff7d025491c7e11b3be97a00f
-DIST twitter-1.15.0.tar.gz 41074 SHA256 4c7079231c0826f3a4e8e28f9384ff928813ed2527a059c86074a695e309cbd4 SHA512 a0e97a9123afb19c3a57d2cfe0383aa87a8d1bd681a99895414bc304279bb3d638ddb14c9d01906f3ae78562a5447f027cad4e68175d1d3cdb6f408bcccef213 WHIRLPOOL 0a2aa6c7cd7cbc4e9e90eb5cb0edd5634df8dc5b4d721d8e3311b7113b6ae2347a2b7e3e7dadba003dfe42e03b7462d49f9e31909744cb3c206aa4169ffdb3c9
-DIST twitter-1.16.0.tar.gz 42597 SHA256 92a4c13570806cf3ae2aab10ff97000c1aa7fcc0ed5740ca1df01346642e3ec3 SHA512 090b8fc4a535d2b9be290e84a46b3d478e876fb4c9423266f385f33c5e325e1b9cbf8af039ac5066e7fca4f431abf2c64046af9ebd7a5884b5b2775292437246 WHIRLPOOL 4f2249a31f560e2e07d77a11366df68d1fa3f79cfa8e2fb2ec338a4278834ece111056089edaa4a58292678f243b4ef2fbb38acb59c2a83f5ce46776360f287f
 DIST twitter-1.17.0.tar.gz 42869 SHA256 85396c4c33b9b213f3d2d805caaf6b386b9e277af9117eb51e5a782f77257376 SHA512 26acaa2d608c09d749d95d27fb51f76df4bd4358d0f49ea5afe8ca0db0d06873d265d67c23858e26d8ce513041adaa0445221b09b0353c3508328e8715d1280c WHIRLPOOL 8196ad84473d24c3c55d342deae7c2dd7c0438be03749159a0488250d9fea2e99b54a1e13c3661cd8fc17c7484308b269611ec2b6dfe4262820173bb549c8408
diff --git a/dev-python/twitter/twitter-1.14.3.ebuild b/dev-python/twitter/twitter-1.14.3.ebuild
deleted file mode 100644
index 9f347f24db4b..000000000000
--- a/dev-python/twitter/twitter-1.14.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 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 )
-
-inherit distutils-r1
-
-DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
-HOMEPAGE="http://mike.verdone.ca/twitter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/twitter/twitter-1.15.0.ebuild b/dev-python/twitter/twitter-1.15.0.ebuild
deleted file mode 100644
index 4a0c8ba5ebdf..000000000000
--- a/dev-python/twitter/twitter-1.15.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 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 )
-
-inherit distutils-r1
-
-DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
-HOMEPAGE="http://mike.verdone.ca/twitter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/twitter/twitter-1.16.0.ebuild b/dev-python/twitter/twitter-1.16.0.ebuild
deleted file mode 100644
index 9f347f24db4b..000000000000
--- a/dev-python/twitter/twitter-1.16.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 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 )
-
-inherit distutils-r1
-
-DESCRIPTION="An API and command-line toolset for Twitter (twitter.com)"
-HOMEPAGE="http://mike.verdone.ca/twitter/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/twitter/twitter-1.17.0.ebuild b/dev-python/twitter/twitter-1.17.0.ebuild
index 9f347f24db4b..cb64f7852826 100644
--- a/dev-python/twitter/twitter-1.17.0.ebuild
+++ b/dev-python/twitter/twitter-1.17.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$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/wcsaxes/Manifest b/dev-python/wcsaxes/Manifest
index df3441cbc88b..2ba5a5830302 100644
--- a/dev-python/wcsaxes/Manifest
+++ b/dev-python/wcsaxes/Manifest
@@ -1 +1,2 @@
 DIST wcsaxes-0.3.tar.gz 773984 SHA256 012861678afa3c05700c4dd94a73bbd0534dae7ef8d9dc215fb01d6e5a60477f SHA512 597494609e2add782dcf84a6163b7093d1a467ffb6321d6d25064f9f87dcb0f7e5e076818b0707b9f10d0894a26ce240cda9598f035364832efe57d6ec51d76a WHIRLPOOL 1d05ce40460a2477c43107f33a68de08cdeb66ee395d3311ee74c9e7d354b675584f3e5d79ea91303a1808ab767df6f54bb5c65993009edfa67b416057c459fe
+DIST wcsaxes-0.6.tar.gz 617882 SHA256 ab8101ff742ebba79da3ff7bf777f24fcf8275886dbb5482f0a2eb3ab6756ee4 SHA512 6254fabc31b7c2e44dd86b0330592e01a688e36957e9d96348f7b4d305242e02e27d2363fd7ada37ad6dba292c66bbace9ea675f475388ed5545ac24cad1226c WHIRLPOOL e2f1d7b230fb7ba3982915638535258377fd450d47f3f191ba0a12aa1698050213353e315de2329e3f8ad359a76bfccdc4291e49eb6b0a4947d0f41305977100
diff --git a/dev-python/wcsaxes/files/wcsaxes-0.6-disable_mpltest.patch b/dev-python/wcsaxes/files/wcsaxes-0.6-disable_mpltest.patch
new file mode 100644
index 000000000000..b62e15a44569
--- /dev/null
+++ b/dev-python/wcsaxes/files/wcsaxes-0.6-disable_mpltest.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Remove the tests that require pytest-mpl
+ Pytest_mpl is (still) not available in Debian.
+ https://github.com/astrofrog/pytest-mpl
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -11,7 +11,6 @@
+ minversion = 2.2
+ norecursedirs = build docs/_build
+ doctest_plus = enabled
+-addopts = --mpl --mpl-baseline-path=wcsaxes/tests/baseline_images
+ 
+ [ah_bootstrap]
+ auto_use = False
diff --git a/dev-python/wcsaxes/files/wcsaxes-0.6-disable_numpy_warnings_test.patch b/dev-python/wcsaxes/files/wcsaxes-0.6-disable_numpy_warnings_test.patch
new file mode 100644
index 000000000000..ff6567c48f94
--- /dev/null
+++ b/dev-python/wcsaxes/files/wcsaxes-0.6-disable_numpy_warnings_test.patch
@@ -0,0 +1,16 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Disable test_no_numpy_warnings
+ This test may fails when numpy decides that it wants to put some important
+ message as a warning; even if nothing goes wrong. This happens f.e. for
+ numpy-1.11.0~b2.
+--- a/wcsaxes/tests/test_misc.py
++++ b/wcsaxes/tests/test_misc.py
+@@ -51,6 +51,8 @@
+ COORDSYS= 'icrs    '
+ """, sep='\n')
+ 
++# see https://github.com/astrofrog/wcsaxes/issues/187
++@pytest.mark.xfail
+ def test_no_numpy_warnings():
+ 
+     # Make sure that no warnings are raised if some pixels are outside WCS
diff --git a/dev-python/wcsaxes/wcsaxes-0.6.ebuild b/dev-python/wcsaxes/wcsaxes-0.6.ebuild
new file mode 100644
index 000000000000..67bda681b879
--- /dev/null
+++ b/dev-python/wcsaxes/wcsaxes-0.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Framework for plotting astronomical and geospatial data"
+HOMEPAGE="http://wcsaxes.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/astropy[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6-disable_mpltest.patch"
+	"${FILESDIR}/${PN}-0.6-disable_numpy_warnings_test.patch"
+)
+
+python_prepare_all() {
+	sed -i -e '/auto_use/s/True/False/' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx -w
+}
+
+python_test() {
+	virtx esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-ruby/pdf-core/Manifest b/dev-ruby/pdf-core/Manifest
index 12b9615a94be..1facd255a226 100644
--- a/dev-ruby/pdf-core/Manifest
+++ b/dev-ruby/pdf-core/Manifest
@@ -1,3 +1,2 @@
-DIST pdf-core-0.5.0.gem 43008 SHA256 582c08d26965ab59d2129c34ddb5437300c9a5ecf1138a7cd75f905d590f8686 SHA512 67f4055de49dace03e7272668e79e00def9f2c6ebcd3edfff2a12830e3fd2449037c79202c0d575696cbef8e67da5bc430c17b0d842115e0291ff95f135716e8 WHIRLPOOL d4a060fcd42c018b9a2a11a195e05198c60998be9c3c7d5127293fc8cdd3c13736a54895e96cf9a6c09c56bfbd53d7fc5b7ae6cbd1f904c31e73584d0dd2118d
-DIST pdf-core-0.5.1.gem 43008 SHA256 d2b0761c0c5b6b0c196f22bce184060230db689c1436c996892d26b97d2d083d SHA512 b88025556d04af27117092ad7bf6bf08d3424ade3515815b8d26be1aa63940e956cbd0194f10953439bd51f4f743432b59262c48151132f17e20b5efb2649635 WHIRLPOOL cd9f91568d01634f185cadb1e34384b09dbb9cedae036e75f640a9b6a40ca79b71685c7714d1d868c8383f012808cab065dbc5dc58cae64abc20936024a75c34
 DIST pdf-core-0.6.0.gem 43008 SHA256 5ece7892eb5e28ec08625c895a23cfc790e8f3d5031f25dceb1b018dfd2a49cf SHA512 a6090a17aa570d12b18e501cc6b9f2cfbec30cd497ba7bbf63cc2d13136635c67db906fe1c04caa3a52b5d31008708e9c433872d95bed5742c517028670252c2 WHIRLPOOL 6943b8d2a87e0e20ec812b1d5d69e9c440a2586dd9c6276c0c4aebe8b2a3617a248b8b78d1e89eae73c139e5421fd01f788130ef8e1a10f9fb3a0f109980b8d0
+DIST pdf-core-0.6.1.gem 43008 SHA256 debd79635c3d1e40d4f35bb3b7524b8077fc6d8a568679dc7d3bced6e60410e8 SHA512 dc9074658cb4037fc1ab4f51a19bd67396c31ef18ac5c89e94563711eced8a7a6ec642e907564c92453cac08cd7a09f6da6f6da87536475cce8238cef087467a WHIRLPOOL 4264d49d6a87c379b41ee4997938491ab7488c61517abdbcce1bd9e348edd642316a8ca8d6578a3125d4098337ddc94e25a87850c1a060f3b7b1846027d5ee32
diff --git a/dev-ruby/pdf-core/pdf-core-0.5.0.ebuild b/dev-ruby/pdf-core/pdf-core-0.5.0.ebuild
deleted file mode 100644
index 837a95a75a7e..000000000000
--- a/dev-ruby/pdf-core/pdf-core-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements low level PDF features for Prawn"
-HOMEPAGE="https://github.com/prawnpdf/pdf-core/"
-
-LICENSE="|| ( Ruby GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( =dev-ruby/pdf-inspector-1.1*
-	>=dev-ruby/pdf-reader-1.2 =dev-ruby/pdf-reader-1* )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/pdf-core/pdf-core-0.5.1.ebuild b/dev-ruby/pdf-core/pdf-core-0.6.1.ebuild
similarity index 88%
rename from dev-ruby/pdf-core/pdf-core-0.5.1.ebuild
rename to dev-ruby/pdf-core/pdf-core-0.6.1.ebuild
index ed53c9c4987a..740bc42f7913 100644
--- a/dev-ruby/pdf-core/pdf-core-0.5.1.ebuild
+++ b/dev-ruby/pdf-core/pdf-core-0.6.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_TEST="rspec3"
 
diff --git a/dev-ruby/polyglot/polyglot-0.3.5.ebuild b/dev-ruby/polyglot/polyglot-0.3.5.ebuild
index 7c041689077f..3bcb65af6f13 100644
--- a/dev-ruby/polyglot/polyglot-0.3.5.ebuild
+++ b/dev-ruby/polyglot/polyglot-0.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 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
index ae31b1e8c27b..1a8ae8c24c52 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-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 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/treetop/Manifest b/dev-ruby/treetop/Manifest
index 6a5b64548e6d..b7fca69fea28 100644
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@@ -1,3 +1,2 @@
-DIST treetop-1.4.15.gem 78336 SHA256 ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff SHA512 350e3b4fc5236f5523e7ba7486699192a689d680e60687519ffdb8707241fce493a86713d1a0a1e243654c609e221b194e151c29bee9aa7cff71ab397223791b WHIRLPOOL a474c3bb9fe43ce73c32cd795214fce168b9d8116746075ef982728b4ded802f5f5995efacf20501c42ddb90fe7e766880dd3e05dd7e8dc815cd804180007b74
-DIST treetop-1.5.3.gem 78336 SHA256 ab3c49c3a39e7c9bea88a90524545e39bed032758a130295f8d6a433c62ff472 SHA512 517ca72fe9c6d27c1ef6722a33b2639fdeb0867ad68b02a7d8795ec1b2bc3b9c9d56aaf400a4159c06c4714065c6a17e44bc985573cb11523d52b53b3a9ec9bf WHIRLPOOL b8b3300a99f65e837dabfd5beaa19d4d83c21b237736f8d675edf4a39ca8061e980b8ea4ccdab1f3c2cba0de0d25ec88db75bbd738258f1e1af2e5b4c632f345
 DIST treetop-1.6.3.gem 81920 SHA256 8b0bb528a57b9af6324ed7c9856b1d1ee2f1b53e71de79628bc47704234862bb SHA512 a4018f551ae74e84d126c4aa7e3bbcd2b2765175d1999bfac328b0b653cb6e5a5e599e51925575024af55092700bd40fd19c20c16d6cb2374d2f8d4b5f7a6229 WHIRLPOOL 20d8d302c309979fb0572c3d8388b3a39afcea31e29555a5173c78f2528a2943540587a059b087a3a380163fbac6f138ffb10e7df5dd48b0cfc42f00fe581461
+DIST treetop-1.6.4.gem 81408 SHA256 bdce555085a1aaabf503abd036b81e1bd0f724f17bea1331b39ed866c2106241 SHA512 2e685dae085d4fb851d565806338a8c04ac55d22d804ce1a6e4e7fa69f77c45793d7ec05f8cf54db6f0f4ab92b947f429e196726cc99048f2b06134d276185ed WHIRLPOOL e5fcc119bcba99a5019a784557159dd5ed319e56c87d56d9a9c8e6c21c7d6f32f57bf272d9c19481007a6526ec72b59bb83459bd0e27b4b2d38a207820d5b390
diff --git a/dev-ruby/treetop/treetop-1.4.15-r1.ebuild b/dev-ruby/treetop/treetop-1.4.15-r1.ebuild
deleted file mode 100644
index a1cf6850b48a..000000000000
--- a/dev-ruby/treetop/treetop-1.4.15-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# jruby fails tests, not investigated yet.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Treetop is a language for describing languages"
-HOMEPAGE="http://treetop.rubyforge.org/"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-0.10.2 dev-ruby/activesupport )"
-ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
-
-all_ruby_prepare() {
-	# Use a ruby18 compatible regexp, already fixed upstream.
-	sed -i -e 's/\[:\^space:\]/\^[:space:]/' spec/compiler/character_class_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-}
diff --git a/dev-ruby/treetop/treetop-1.5.3.ebuild b/dev-ruby/treetop/treetop-1.6.4.ebuild
similarity index 64%
rename from dev-ruby/treetop/treetop-1.5.3.ebuild
rename to dev-ruby/treetop/treetop-1.6.4.ebuild
index 3861c298e453..d69403ae14cb 100644
--- a/dev-ruby/treetop/treetop-1.5.3.ebuild
+++ b/dev-ruby/treetop/treetop-1.6.4.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-# jruby fails tests, not investigated yet.
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -23,12 +22,7 @@ SLOT="0"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
-ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
-
-all_ruby_prepare() {
-	# Use a ruby18 compatible regexp, already fixed upstream.
-	sed -i -e 's/\[:\^space:\]/\^[:space:]/' spec/compiler/character_class_spec.rb || die
-}
+ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1:0"
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/dev-util/anjuta/anjuta-3.18.2.ebuild b/dev-util/anjuta/anjuta-3.18.2.ebuild
index f0f3bdefb2e2..1671bb66883e 100644
--- a/dev-util/anjuta/anjuta-3.18.2.ebuild
+++ b/dev-util/anjuta/anjuta-3.18.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/cscope/cscope-15.8a.ebuild b/dev-util/cscope/cscope-15.8a.ebuild
index 8db9728cdede..208407b7d1e8 100644
--- a/dev-util/cscope/cscope-15.8a.ebuild
+++ b/dev-util/cscope/cscope-15.8a.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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/dev-util/debootstrap/debootstrap-1.0.78.ebuild b/dev-util/debootstrap/debootstrap-1.0.78-r1.ebuild
similarity index 65%
rename from dev-util/debootstrap/debootstrap-1.0.78.ebuild
rename to dev-util/debootstrap/debootstrap-1.0.78-r1.ebuild
index 8c30ccb533b4..1ea5e165e7ea 100644
--- a/dev-util/debootstrap/debootstrap-1.0.78.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.78-r1.ebuild
@@ -1,8 +1,8 @@
-# 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 eutils
 
 DESCRIPTION="Debian/Ubuntu bootstrap scripts"
@@ -40,7 +40,13 @@ src_install() {
 
 pkg_postinst() {
 	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring"
-		elog " (--keyring=K), please install app-crypt/gnupg."
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
 	fi
 }
diff --git a/dev-util/devhelp/devhelp-3.18.1.ebuild b/dev-util/devhelp/devhelp-3.18.1.ebuild
index d2c6c131d1de..9022eb7a58ba 100644
--- a/dev-util/devhelp/devhelp-3.18.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.18.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-2+"
 SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="gedit"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
index 1e93e9ac4eba..67f9bc2bab72 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
index f144b2ff7123..1671e1d3121d 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/"
 
 LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
index dc8003219c83..e61fe6c77e24 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
index cd3f82a3e6dc..60ba2221de59 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.45.8:2
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index cd58451961d3..405c02e69d23 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,3 +1,4 @@
+DIST mdds-1.1.0.tar.bz2 258691 SHA256 4253ab93fe8bb579321a50e247f1f800191ab99fe2d8c6c181741b8bd3fb161f SHA512 928cb6dffacdb2fe9e67dde094bbd8191137cb58402172d0fc99ed8c7aa6069668c6b1f06e515366a0843325ea051e8e0650aa2142cbc94b107a748a399d7a47 WHIRLPOOL 79ec5589ad682712244cc235c8ec7f9626208526b43839f07fff9dfc96509e232fccce801664b2c50b00dcde656cb78e8ac1e5db2fde7c807bc5507af410a83b
 DIST mdds_0.10.3.tar.bz2 151389 SHA256 db10932dbe7e9b5b9b3f513bc8165ab7e29c3bf75702b3c3cfff6956c521e0c2 SHA512 52be0fe4eedc8a44f61944e078d8f0d2490bfea27451c5d4772b6d46d71562702d3b90b34c5721d8bdf6de2ea32a4a9126e310614bb36e0d573c047dfc9f3fcb WHIRLPOOL 17a461cf01f286ccb0e8b351e627dc870db5676a3698cf99f1520b01562138a8d74fa99ccca901d81b5f354abf95ff35d2a7957a3bf2dae16d92aee12e62f8b1
 DIST mdds_0.11.2.tar.bz2 154444 SHA256 cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab SHA512 b0e00d50be9b8319dabfe7e607849af27a52be9b46d770849b919444b905bf198d99edcefe1be15e6018b79839443b3a709fe22b84ac11e2267f02bec5139633 WHIRLPOOL a505c4b746c7ffefe3ea74fd0eb7c2ae46b4c598e1136cf9e9cfe44a4c48db2bb1b84528a5f0a86cc1b7a5c9d5b7d82522bd7836ed5e4de61d9664a863e1b014
 DIST mdds_0.12.0.tar.bz2 152285 SHA256 2a22de23ca828886625120e9d40fccd6333458a1934a13d2c982b6f9403e5981 SHA512 462f6e3701eb7cce872ce0a76d826886eedccf5ca20293d03744b6d6d5ff1ef16770c6abce1c9118829e252e90783e206d281006d0d4e7e9b328ed9ae37264c1 WHIRLPOOL f86314644d80ae1b75a4cc1af6ebc4a3df3b65eac4244abc0fbf69893020509abae3be7e758d90a07eafffb866d67dcb75968b38a411e747d7f361a7d2905f0b
diff --git a/dev-util/mdds/mdds-1.1.0.ebuild b/dev-util/mdds/mdds-1.1.0.ebuild
new file mode 100644
index 000000000000..754707aed497
--- /dev/null
+++ b/dev-util/mdds/mdds-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
+
+inherit eutils toolchain-funcs ${GITECLASS}
+
+DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
+HOMEPAGE="https://gitlab.com/mdds/mdds"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="1/${PV}"
+IUSE="doc valgrind"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="dev-libs/boost:="
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=() # buildsystem installs docs
+
+src_prepare(){
+	eapply_user
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable valgrind memory_tests) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() { :; }
+
+src_test() {
+	tc-export CXX
+	default
+}
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index e0db9959c3b9..754707aed497 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
@@ -11,27 +11,34 @@ inherit eutils toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P/-/_}.tar.bz2"
+[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
-SLOT="0/${PV}"
-IUSE=""
+SLOT="1/${PV}"
+IUSE="doc valgrind"
 
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="dev-libs/boost:="
-RDEPEND="${DEPEND}"
+COMMON_DEPEND="dev-libs/boost:="
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)"
+RDEPEND="${COMMON_DEPEND}"
 
-[[ ${PV} == 9999 ]] || S=${WORKDIR}/${P/-/_}
+DOCS=() # buildsystem installs docs
 
 src_prepare(){
+	eapply_user
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {
 	econf \
-		--with-hash-container=boost \
+		$(use_enable doc docs) \
+		$(use_enable valgrind memory_tests) \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 }
 
diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml
index 4bf2727332a9..c054dfb0bb86 100644
--- a/dev-util/mdds/metadata.xml
+++ b/dev-util/mdds/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="google-code">multidimalgorithm</remote-id>
 	</upstream>
+	<use>
+		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/meld/meld-3.14.2.ebuild b/dev-util/meld/meld-3.14.2.ebuild
index 3ed56a0e0aff..97b12453e52d 100644
--- a/dev-util/meld/meld-3.14.2.ebuild
+++ b/dev-util/meld/meld-3.14.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index c7d440e4b541..17474eca2309 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,15 +1,15 @@
 DIST git-2.4.10.tar.xz 3695176 SHA256 b631b2b26f5593833a29cd833b8071b4eaf7b212fba180e587b526f51c2331df SHA512 08f7f63fd4820f155aec08373fd4f5abbe5a4c8f98a73a824897ba68901fb274b4cf47b8751cd2bea358cbb9c09934f7857aa440de69b46ee88a4bba852f5ced WHIRLPOOL 3ec53b7355f1895c95b91e1fa85f185801acdb0317384099e4d7914208c3d762d536ed83e099c96a168d696e37e3f8a491459de59c7dd59dce9c49fb75af836b
 DIST git-2.5.4.tar.xz 3747552 SHA256 e08d2d384e1c8c474d336c3583ed5cd396c76455155a4e65bfa97699fc38472a SHA512 25964bc59301b11994c94bab618613bc87ef788d356af55a26c77861a939f2b67cf37be98199e81d5c2a63e8d9c043b4fc6fb481316cc4d8bb6a1f382eddf33e WHIRLPOOL e62efd86c5e0d1b040816978cc28a41d00a7c095513482b0df1d4addc87bd89ce20dbb1b77e3ec3d9bd0722de3237e451b05f687fdb6419fa419708921049222
 DIST git-2.6.5.tar.xz 3822016 SHA256 07ce40131821c42fbcfa8f989b384f30f64f3665c06e8b2c2e2077d730777db5 SHA512 c71a1ad80eced40b007d9a6dc10d081fcf5b9b384f20d5db2e3a2646191838070369b96c172a66d86eaa488634bd4adbe0840f0c4dade51a45eba2fd3a0870a5 WHIRLPOOL 331e8422cdaf0376ea6ff15f8b7abc2d14355fda9871ad8928fd7d46df3cd88e94702da243c5032e1e1e364def92b3fd8b852e8b7aaa98a69bb20599417ba50c
-DIST git-2.7.0.tar.xz 3861524 SHA256 fa9fb34efce9c80527152a40fbae138e83bd04a15ef9111726252259345a7b0d SHA512 e2d51e3d547229bb1e5c3a92c71476695f23420d9c639f9cb1d953fd00579aad92f9bbaf8f3d45f966c9476da73bf4c11dabf18c06f542de6e4d26e12c43dcf3 WHIRLPOOL e0dc8071ebc4e0558a2f2b9d8b32d840f4278e893777367029e84a57bf52d1d00eadb778a3e6df70c93de8cb754b94ff985ae6025ff98d6276629d7d3318aa19
 DIST git-2.7.1.tar.xz 3905876 SHA256 477a8137de342f858d364383266e9551e582718e96b34051a6aaef57606d6bfe SHA512 968a77ed2dd0118a55fdc0715c1dad3edbef59cad15d57d1cd6f8385636480746bf8f934e5bbf4e7cf2264cb59f387260a10e851f0b4a54b0b959e19e8856dbb WHIRLPOOL 9cb5e59eb8dfbad56b6046fac69dcd0e3588558a30c5c8d67499b75afbd4bddf2053bd1907c584a984649b40ae7f67d659ac9abe6658b2d93d4fafcc1042e3ed
+DIST git-2.7.2.tar.xz 3907296 SHA256 b20479ce523031c37581b763b4442b25b9d606f2f416049aea4e463dc150cf20 SHA512 fa139b10d134742efa74707ca77111463656000fd3fae52752eb5af1e56b57d9a2a6d21e6c23085af8db830b811387435fe95c1310b28ef280630e99e432fc79 WHIRLPOOL f4b570afb846c01110ee95ee4c9d8104e6ebb65c82e0a81bdf87b08e6f81ae6861e4292840ac6ad18463007134778d12d306a6e8a067c811a0342c4869e7d6ef
 DIST git-htmldocs-2.4.10.tar.xz 996588 SHA256 f2c523ea114caac7c5cf51a20a420a215411762fabff2da9febfc2917af835ef SHA512 60fc5a2b6665ec7fc10680608b5689a24fa211fe7393f010a8099c6fb0a9582f20cebc7cad0653b62750677d79a80fcd6e8e96fb440acb3fc7c7c0ffc00779d3 WHIRLPOOL 30585753a7b08dfa812c74832d35168d3615d8bf71c3c853efb125348538b5fb7cc4b3f1cfef725082ade144b5362394991186967f6026cee8c91dd41e30290e
 DIST git-htmldocs-2.5.4.tar.xz 1009820 SHA256 cb36b3b7198a3fa49f2677bba83f1e57a1a40250a181d9e86232cb8febcc8053 SHA512 af833635632ba5c65524bfef00f291a41fd37ba7bd9ca4b65b4c0eb9329b888d2e8757fe29f33bd25a75e1841d67a20dff49f43d35a502ef3b29599d073dcd6a WHIRLPOOL e5f55c3dbdf69d946295c5c19b95a79168d34645ced8e6a837ec8b5dd948008487288159f63a2f81a36fbdf3f413d3fdefd008b0157785df37431ccb9127284e
 DIST git-htmldocs-2.6.5.tar.xz 1021516 SHA256 40b5ee75a69d834005b36dd190dc0164124593cca233391774a3a9c82af88de5 SHA512 dc796bbe54104821c8be8a7475039a8a6b207d3e3bd20b950d786b02c824801e3f915389af7c267b83800ed2e0d1b037fb543d6c0f942f887c715a361a589728 WHIRLPOOL 3abd96db7ed3368a8903ff89265c6a44c8e5a2127695edca6bdc2511a27dd45c546016400f926c367030602828329a194fc2683785f25c7833c18c9f32ea57f1
-DIST git-htmldocs-2.7.0.tar.xz 1028748 SHA256 a9d30a744eb07392ba3ffe389cca7e57a2bdd718c9ffccdf2d525eeafac548a9 SHA512 e86dd5874c87bd9df9a76a50bc41280dbcaff7b24547d57eae1f68f97645e15dc35027754425013bef6fea1bd4f6e9e23ac0aac80023166a29848deee7d3d4d0 WHIRLPOOL 435b67e536991b6a31f5b70870947f30fe9d2318648bb061ed96608acc0e5deca4d21574cbdcb06548ab90fb2a368e5a629610aaa5f030c91ec9d6e0965be302
 DIST git-htmldocs-2.7.1.tar.xz 1030484 SHA256 9a9b857fb28fef8ad2fd780b263331f2f5d3f09338c64bd902f8a5ec03bbfc89 SHA512 b97223f7fec21d254f0b1b2407341b84d03ec23ed38e3042541e9cb2e2d847a856524e9e5751d2ff4a00c32f0f02ee667e376c3a6ad00252d6b6bee0dde1af4e WHIRLPOOL 42ba0d194a77d5074f57a6936a72a7f4dbd0cbda0d620eb22fc04ea5ef1d0016d777dbf1e9a06265424f870c0241ef6f79e310f758c90ebf081d05b926e810b0
+DIST git-htmldocs-2.7.2.tar.xz 1031152 SHA256 fabf3afa674931c70d6bb2e37497b46046f554c8d5520f0ccb126ce5e748f724 SHA512 ae925a416cda4a28e9c48ca9178ece7c2e6db20c79c00512a0e3fbe15e2fcc965ec37b848d4b613da2ed10cfaabdaa01f2272c3ca43f5ebac229d3bc44354854 WHIRLPOOL 03b6b194d2f30003370eee4ecbf7155037564fb4afa9aaa9d0b3c282d8ca77db139de22a5317db0b3858e054e803f0ebe5cc225895aacbc10fa7ff76d590c653
 DIST git-manpages-2.4.10.tar.xz 373968 SHA256 da712c07d84bb3da10be9fb56c15289c77828d3011179ab71f090e77e52a03d9 SHA512 d5a978109db70f3d50d02ad17c93229206f2d5a2dd3dd7e9fb266ca7b76b85ad92f63120df885b88b5a33fe1dce0686ae92fc50749cb3b6275cb48812eb031a9 WHIRLPOOL decb0b5bf81b25e4562f639e03c2b60b0c470338be0ac298f3d62deb54538de0961a81c6a8ced17ef5877df6de5c17b49fe96e77f00dd2038d2d1189c8f48e7c
 DIST git-manpages-2.5.4.tar.xz 378296 SHA256 bdd8db3b8cd35d01b2631d1f3c1174e5bc1b62b3e0177ae1954d83743aa93ea9 SHA512 ccd675d8d9c117042083800fa4ae7a876a7873cf13844c92f731e46553d316a949d445c80e4b57824792a6b369623085053d25baeb4f8b79801b5849f06eb084 WHIRLPOOL a2149da3217826c1c4951aa0fa0900e388ea806511559d0e01c4e17a565470048e55e988b12e6da3d7b52b11d410d27b4da0cac4d2d88e3f6860f22664cd8ac9
 DIST git-manpages-2.6.5.tar.xz 381620 SHA256 7b0800c0e3d6a7370413ee9ded8466158170a1635dfd434cec8e2d168e5038ef SHA512 c370811ced1b481e66efeb3f5efb00a5091183d3125e2796b883e6f9e1dfb82032ad303eca5a9380882227aab8c63fe0d5c80dfd80228aaa29d7c7ab6afae9b4 WHIRLPOOL 211866bd59f537bd9ba8d51d037b76f3054afee254d92708137105e7360647d244c3558a70254a94ea99cf96397a5d794ff3b80d893d67e1032abbb18e28b11c
-DIST git-manpages-2.7.0.tar.xz 384248 SHA256 b7f255aa17a5d06b9b71f6e3957f65e8f15789b2d31f09b1c2bf697a21458a0d SHA512 ab3af313c6fd88dca34103fdf2d9d3eaf25b57d0cee90b6eedac05130a0c42e79aa31fdd328e35386765e84cdd5d3143cd870fcdc96983581a7531ac7b1a32a5 WHIRLPOOL cf4af0dfc3a39d072f16e1ef4b6025f63ac3788a5db4f5eec48a1889b67c646044e64b4544a961c7616bd56a4dc57e75532f97c3d4cef92d56a3a1cd20afeae0
 DIST git-manpages-2.7.1.tar.xz 384468 SHA256 e6091a4f13f199109e19ef689b5028337419ed7fa5a9dd284d55efda72751e2d SHA512 b0c0469ce9163e10122e5fabb5a39a1b6faa0a1bbe2c24365aae8f02bebb37e9954d477a02be71737510fd82393c4e0aaa7a4cc1caeda3f93735446ee951923e WHIRLPOOL c87331b7e03dad33239cb1bc36d443fb3e5bac3d2cee36cf825b5bd554b72b532af1136b000b1d82b5d4203b7679dd9c263f9b91a4882961aa7dc472dc1b13d9
+DIST git-manpages-2.7.2.tar.xz 384440 SHA256 19a6254a34da516e1ec67bfcbc6da7a1483440a2e8416b30e736f96c3404ff4b SHA512 b99015148706097bc2a8ca0a885473233fc7e1e3846290d456311058853da205f30175b7c158f67e70ea98fca2dac8c2d6844e73db5a51bea1e57d770bc7a15f WHIRLPOOL dc2f751327520077f48d2cc3b5dc82160c968ee91fbffff9b9717be0096bd2d926d325f2eed42fff0574b22c2d1cf41713f0ce53fb4ee7b4d1842e4a4a3230da
diff --git a/dev-vcs/git/git-2.7.1.ebuild b/dev-vcs/git/git-2.7.1.ebuild
index a5175b98fd42..76902100ffec 100644
--- a/dev-vcs/git/git-2.7.1.ebuild
+++ b/dev-vcs/git/git-2.7.1.ebuild
@@ -380,7 +380,6 @@ src_install() {
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-6~
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
diff --git a/dev-vcs/git/git-2.7.0-r2.ebuild b/dev-vcs/git/git-2.7.2.ebuild
similarity index 96%
rename from dev-vcs/git/git-2.7.0-r2.ebuild
rename to dev-vcs/git/git-2.7.2.ebuild
index a8c159be8fe4..d81bed5f51dc 100644
--- a/dev-vcs/git/git-2.7.0-r2.ebuild
+++ b/dev-vcs/git/git-2.7.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 GENTOO_DEPEND_ON_PERL=no
 
@@ -109,6 +109,20 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]"; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -222,27 +236,17 @@ src_unpack() {
 }
 
 src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
 	# add experimental patches to improve mediawiki support
 	# see patches for origin
 	if use mediawiki-experimental ; then
-		epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-		epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-		epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
 	fi
 
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-
-	epatch_user
+	default
 
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -376,13 +380,15 @@ src_install() {
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
 		docinto ${d}
 		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
 	done
 	docinto /
 	# Upstream does not ship this pre-built :-(
@@ -455,7 +461,11 @@ src_install() {
 		cd "${S}"/contrib/svn-fe
 		dobin svn-fe
 		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
 		cd "${S}"
 	fi
 
@@ -526,7 +536,7 @@ src_install() {
 }
 
 src_test() {
-	local disabled="" #t7004-tag.sh" #520270
+	local disabled="t8005-blame-i18n.sh" #520270
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
diff --git a/dev-vcs/gitg/gitg-3.18.0.ebuild b/dev-vcs/gitg/gitg-3.18.0.ebuild
index e3fa8872217a..729bfdef8b53 100644
--- a/dev-vcs/gitg/gitg-3.18.0.ebuild
+++ b/dev-vcs/gitg/gitg-3.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="debug glade +python"
 REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 5be7e172c7d7..cb1c1d8b1301 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -262,7 +262,7 @@ java-pkg_addres() {
 	shift 2
 
 	pushd "${dir}" > /dev/null || die "pushd ${dir} failed"
-	find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name "MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -0 jar uf "${jar}" || die "jar failed"
+	find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name "MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -r0 jar uf "${jar}" || die "jar failed"
 	popd > /dev/null || die "popd failed"
 }
 
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
index c1e031fadedf..92f0904f1611 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild b/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
index 4531af901fe9..ce5433864266 100644
--- a/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
index 115c3c7ee445..6ca9645387b9 100644
--- a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
+++ b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-chess/gnome-chess-3.18.0.ebuild b/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
index 3a207474dbc0..23e686927558 100644
--- a/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
+++ b/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
index 83764b827d69..f297072c2ddc 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-board/gnome-mines/gnome-mines-3.18.2.ebuild b/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
index adab7c3da0a2..147a54be19fc 100644
--- a/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/games-board/iagno/iagno-3.18.2.ebuild b/games-board/iagno/iagno-3.18.2.ebuild
index df514b4bedf6..bc814400a87c 100644
--- a/games-board/iagno/iagno-3.18.2.ebuild
+++ b/games-board/iagno/iagno-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/games-board/tali/tali-3.18.0.ebuild b/games-board/tali/tali-3.18.0.ebuild
index a506ced19196..8b9394f02f67 100644
--- a/games-board/tali/tali-3.18.0.ebuild
+++ b/games-board/tali/tali-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
index 1c5d4c81bcd5..69834c24a7b4 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="gtk cpu_flags_x86_mmx nls"
 
 RDEPEND="media-libs/libpng:0
diff --git a/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
index bdfb686236d8..ae3f99e4a745 100644
--- a/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
index 59a0b5b46285..dbf478873464 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
index a508e907794d..3141af6a0ad1 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 # fixed vala & gtk+ from gnome-3.16 branch
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
index f3a7d62124c4..1119c5955504 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
index 1a8a1270852a..5b65ff7a0063 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/hitori/hitori-3.16.2.ebuild b/games-puzzle/hitori/hitori-3.16.2.ebuild
index 585280676c3d..c49dee8548a5 100644
--- a/games-puzzle/hitori/hitori-3.16.2.ebuild
+++ b/games-puzzle/hitori/hitori-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
index cad864f179f8..c03826800fae 100644
--- a/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
index 788092c5d3c8..be61444993d7 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
index ed3670db22fa..33ebd862168f 100644
--- a/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild
new file mode 100644
index 000000000000..a34b27486951
--- /dev/null
+++ b/games-rpg/manaplus/manaplus-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools git-r3 games
+
+DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
+HOMEPAGE="http://manaplus.evolonline.org"
+EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="mumble nls opengl pugixml test"
+
+RDEPEND="
+	>=dev-games/physfs-1.0.0
+	media-fonts/dejavu
+	media-fonts/wqy-microhei
+	media-fonts/liberation-fonts
+	media-fonts/mplus-outline-fonts
+	media-libs/libpng:0=
+	media-libs/libsdl2[X,opengl?,video]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	net-misc/curl
+	sys-libs/zlib
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-misc/xdg-utils
+	mumble? ( media-sound/mumble )
+	nls? ( virtual/libintl )
+	opengl? ( virtual/opengl )
+	pugixml? ( dev-libs/pugixml )
+	!pugixml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash \
+	egamesconf \
+		--with-sdl2 \
+		--without-internalsdlgfx \
+		--localedir=/usr/share/locale \
+		--prefix="/usr" \
+		--bindir="${GAMES_BINDIR}" \
+		$(use_with mumble) \
+		$(use_enable nls) \
+		$(use_with opengl) \
+		--enable-libxml=$(usex pugixml pugixml libxml) \
+		$(use_enable test unittests)
+}
+
+src_install() {
+	default
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavuserifcondensed.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf
+	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf
+
+	prepgamesdirs
+}
diff --git a/games-rpg/manaplus/metadata.xml b/games-rpg/manaplus/metadata.xml
index 26079e608bed..b513812cb89e 100644
--- a/games-rpg/manaplus/metadata.xml
+++ b/games-rpg/manaplus/metadata.xml
@@ -5,4 +5,8 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="pugixml">Use <pkg>dev-libs/pugixml</pkg> for XML parsing isntead of <pkg>dev-libs/libxml2</pkg></flag>
+		<flag name="mumble">Enable support for voice chat</flag>
+	</use>
 </pkgmetadata>
diff --git a/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
index e138e3f617b5..a144e6cadfae 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.3:2
diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
index 51ae704f412b..a1f1fe1872cf 100644
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://projects.gnome.org/gconf/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="debug +introspection ldap policykit"
 
 RDEPEND="
diff --git a/gnome-base/gdm/gdm-3.18.2.ebuild b/gnome-base/gdm/gdm-3.18.2.ebuild
index 15a468f5d696..b52aa88557c2 100644
--- a/gnome-base/gdm/gdm-3.18.2.ebuild
+++ b/gnome-base/gdm/gdm-3.18.2.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 
 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
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
index 90221bc65fcb..515b9cf0e677 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+autoconf-archive"
 
 RDEPEND="autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 )
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
index c708358183e0..714ffc27fd63 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 LICENSE="GPL-2+"
 SLOT="2"
 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
index 795f5cf5261e..ef4c5052b4ea 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
@@ -12,7 +12,7 @@ IUSE="+bluetooth +cdr cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 # Note to developers:
 # This is a wrapper for the core apps tightly integrated with GNOME 3
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
index 1b3585689367..dae9c7f9157b 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
@@ -12,7 +12,7 @@ IUSE="cups python"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Note to developers:
 # This is a wrapper for the core libraries used by GNOME 3
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
index ada8058e5a1b..0151f31e0ce8 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="3/12" # subslot = libgnome-desktop-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
index 5aea7dc35347..338685d4dd49 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
@@ -12,7 +12,7 @@ IUSE="+games +share +shotwell +tracker"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
index 0d19a8828b11..8633663a55ec 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-light/gnome-light-3.18.0.ebuild b/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
index 9b236c6f9f86..9a88dd6ca543 100644
--- a/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
@@ -12,7 +12,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
index 9b90894c75fe..718d22641642 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="+introspection test"
 
diff --git a/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild b/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
index 2b0470d450f6..5c7bea4ce1a7 100644
--- a/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-session"
 
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elibc_FreeBSD ipv6 systemd"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
index 6dcd65194674..429147429578 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	smartcard? ( udev )
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.7:2[dbus]
diff --git a/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
index b688230c52fd..f51bd3fc0324 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+bluetooth +networkmanager +nls -openrc-force"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
diff --git a/gnome-base/gnome/gnome-3.18.0.ebuild b/gnome-base/gnome/gnome-3.18.0.ebuild
index 16281a64ac21..929513a565ad 100644
--- a/gnome-base/gnome/gnome-3.18.0.ebuild
+++ b/gnome-base/gnome/gnome-3.18.0.ebuild
@@ -12,7 +12,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 
 IUSE="accessibility +bluetooth +classic +cdr cups +extras"
 
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
index 5818884c13cf..ee9a32769b96 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gvfs/gvfs-1.26.3.ebuild b/gnome-base/gvfs/gvfs-1.26.3.ebuild
index 4646dba4d1f0..2b0c0f11ea0e 100644
--- a/gnome-base/gvfs/gvfs-1.26.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.26.3.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 	udisks? ( udev )
 	systemd? ( udisks )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Can use libgphoto-2.5.0 as well. Automagic detection.
 RDEPEND="
diff --git a/gnome-base/libgtop/libgtop-2.32.0.ebuild b/gnome-base/libgtop/libgtop-2.32.0.ebuild
index c0e902392a00..1dcc15316387 100644
--- a/gnome-base/libgtop/libgtop-2.32.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.32.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2"
 SLOT="2/10" # libgtop soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.26:2"
diff --git a/gnome-base/librsvg/librsvg-2.40.13.ebuild b/gnome-base/librsvg/librsvg-2.40.13.ebuild
index d38ade171363..9615467ff2da 100644
--- a/gnome-base/librsvg/librsvg-2.40.13.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.13.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection vala tools"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/nautilus/nautilus-3.18.5.ebuild b/gnome-base/nautilus/nautilus-3.18.5.ebuild
index 04c8410e5cb3..82561ef9e588 100644
--- a/gnome-base/nautilus/nautilus-3.18.5.ebuild
+++ b/gnome-base/nautilus/nautilus-3.18.5.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 
 IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: tests fails under Xvfb, but pass when building manually
 # "FAIL: check failed in nautilus-file.c, line 8307"
diff --git a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
index 900100e4fbfd..53b4a9213af8 100644
--- a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
+++ b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
index e8fdca94b5a9..f1ff33df81aa 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
index efc141241e08..9e6068aaee60 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection systemd"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
index 1da114d46786..e53cb629f89d 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="+introspection"
 
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
index fd41717b3b40..902bda93f792 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc pam systemd"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
index 13d43b64feef..f9d700a6bca9 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc ipv6 systemd"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
index 4235b31db497..9caab862e317 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
 
 # udev is non-optional since lots of plugins, not just gudev, pull it in
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
index 7cbeac18537d..8dd62f7be62a 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
index 62a193c98954..5452e342014f 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	app-accessibility/at-spi2-atk:2
diff --git a/gnome-extra/cjs/cjs-2.8.0.ebuild b/gnome-extra/cjs/cjs-2.8.0.ebuild
index 7f766c8bd95c..902f86491dc1 100644
--- a/gnome-extra/cjs/cjs-2.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-2.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:24
diff --git a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
index 56058320c516..459be20bb30a 100644
--- a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="xattr"
 
 RDEPEND="
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild
index c4782b8fdde9..091471e1cee2 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild
@@ -20,7 +20,7 @@ SLOT="0/54" # subslot = libcamel-1.2 soname version
 IUSE="api-doc-extras +berkdb +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 
 # sys-libs/db is only required for migrating from <3.13 versions
 # gdata-0.15.1 is required for google tasks
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild
index f511fc91a43c..f8320ee5200d 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild
index 0531741771b7..f9966ed2f9c6 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.18.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # We force 'bindist' due to licenses from gnome-boxes-nonfree
 IUSE="smartcard usbredir" #bindist
-KEYWORDS="~amd64" # qemu-kvm[spice] is 64bit-only
+KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only
 
 # NOTE: sys-fs/* stuff is called via exec()
 # FIXME: ovirt is not available in tree
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
index 1187727508e3..8c3413245036 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
 
 LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection python vala"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild
index d51544b7c61c..e3e9533c6ae3 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.40:2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
index 6161be99d601..60a80692daa0 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
index 140be511b43d..6a297851cea2 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
index f12b4948a1ab..b5fcfd15a44f 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
index f9514061e078..6369b2b5384e 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="packagekit raw"
 
 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
index 4267a3b98035..50d80ec7c195 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.7.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.7.ebuild
index ac861f2e9aed..d1acf5afd301 100644
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.7.ebuild
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-libs/glib-2.35:2
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild
index 346be520ba99..8521ad266d68 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
index a1fbc15a03ec..6bec04c6d01b 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Projects/DVBDaemon"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="nls totem vala"
 
 RDEPEND=">=dev-libs/glib-2.32.0:2
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
index dd1f78fee3cc..91424da1359b 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
index d2907a8777f5..03c180487939 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
index 63af3285f574..c288e7f49be6 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.45.8:2
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild
index 727cb89b16d1..e8cc601bce16 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
index de287b081e1e..75f42adead3e 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
index dd1c892fc82d..80e7fe9dace4 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild
index 8557cf79534c..58ad6438717e 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Newer pygobject needed due upstream bug #723951
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
index 34dc73c7b5b3..949c77c6e549 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
index 530f69e65e35..f038e821ffde 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # FIXME: could libnotify be made optional ?
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
index 5974a8fa8e32..1d3d892c31fe 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index f5939c663b55..4a97faf8d573 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
diff --git a/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
index a9efc98ef1ef..87bc0a1b28de 100644
--- a/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
 
 LICENSE="GPL-3"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 
 IUSE="cjk +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
index 221aa1c66d69..082ba4575c48 100644
--- a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 # firebird license is not GPL compatible
 
 SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	app-text/iso-codes
diff --git a/gnome-extra/libgsf/libgsf-1.14.36.ebuild b/gnome-extra/libgsf/libgsf-1.14.36.ebuild
index 79bee5c34987..38c8e3383d1f 100644
--- a/gnome-extra/libgsf/libgsf-1.14.36.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.36.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
index 6f57138e22ac..c8eb8043ccf4 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild
index 5bd4bccae48f..9f96299b4dc1 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/gnome-extra/nemo/nemo-2.8.6.ebuild b/gnome-extra/nemo/nemo-2.8.6.ebuild
index 9e1d1ade57c4..383e1b776699 100644
--- a/gnome-extra/nemo/nemo-2.8.6.ebuild
+++ b/gnome-extra/nemo/nemo-2.8.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="exif +introspection +nls packagekit tracker xmp"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild b/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
index 4a4a8759eef4..1eb3f3c92fbb 100644
--- a/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="bluetooth +introspection modemmanager"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	app-crypt/libsecret
diff --git a/gnome-extra/sushi/sushi-3.18.0.ebuild b/gnome-extra/sushi/sushi-3.18.0.ebuild
index 327047e709d8..6c483facc76f 100644
--- a/gnome-extra/sushi/sushi-3.18.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="office"
 
 # Optional app-office/unoconv support (OOo to pdf)
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
index a139346f53b7..5b77b6ea154b 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/yelp-3.18.1-r1.ebuild b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
index fdf3179b8da2..3f8f65b6be80 100644
--- a/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
+++ b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/gnome-extra/zenity/zenity-3.18.1.1.ebuild b/gnome-extra/zenity/zenity-3.18.1.1.ebuild
index ba1029b1e8b4..4936d5956989 100644
--- a/gnome-extra/zenity/zenity-3.18.1.1.ebuild
+++ b/gnome-extra/zenity/zenity-3.18.1.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="libnotify test webkit"
 
 RDEPEND="
diff --git a/mail-client/evolution/evolution-3.18.5.1.ebuild b/mail-client/evolution/evolution-3.18.5.1.ebuild
index dedc34aa55a9..5f4aa08c4e6b 100644
--- a/mail-client/evolution/evolution-3.18.5.1.ebuild
+++ b/mail-client/evolution/evolution-3.18.5.1.ebuild
@@ -17,7 +17,7 @@ SLOT="2.0"
 
 IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild
index 8648467d309f..77193bea1236 100644
--- a/mail-filter/dcc/dcc-1.3.158.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
 LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild
index 56fb844168a6..e431ff81d631 100644
--- a/mail-filter/libspf2/libspf2-1.2.10.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 BSD-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static static-libs"
 
 DEPEND=""
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
index 7077e5fe131c..9f3390a9317b 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://srs.mirtol.com/libsrs_alt-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!dev-perl/Mail-SRS"
diff --git a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
index e890ce05a5d5..de8d4494e442 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd"
 IUSE="spf"
 
 DEPEND="dev-perl/DBI
diff --git a/mail-filter/rmilter/Manifest b/mail-filter/rmilter/Manifest
index c7cc2580f4a2..fcbb36dcd8fc 100644
--- a/mail-filter/rmilter/Manifest
+++ b/mail-filter/rmilter/Manifest
@@ -1,2 +1,3 @@
 DIST rmilter-1.7.2.tar.gz 159934 SHA256 3033c190667276f1d716784cb6b485971a3249ab9a6151d7a5ae3848e6de61eb SHA512 9b80d55b93335b45b9928dd0ae2caf8cd5757533c8281a24cd2395ef89fe7879fac836368263cdefed3f6df3f83f4134175a161182b7bcdfcbc6de6fd6fe3e31 WHIRLPOOL 137796cab3968f40ec4dcae81fa3ea68d2ba80fff9c9738d140816cca29ca4ff3bd9c02c98e4ef2aaa6b35ff18b455060c20f372614ef6e76ec7d4dbcade8e03
 DIST rmilter-1.7.3.tar.gz 160323 SHA256 515e0f69af9f702cc36fd565e30c9f715bff819df250679d0a24e4f07ba5f081 SHA512 4e65dbcccd7f378eb1dd93ffca1983614df19edf62b531483a59c636eb4564dbb531da2ecce3ea789c038913c8623e78db8636eff64f574eb5abc709cf8fc0e1 WHIRLPOOL 6ae75ec8190f58893b3c33e66cf07dee5ac9326056c3da23005d4c2dcad5a8760c1db08701226ece96b6e3bb12f15337ff686d2eafc6e6323abc299d289de456
+DIST rmilter-1.7.4.tar.gz 162081 SHA256 ad32c2efe23c8b49f6b52a5b78b80943b93082d30c799e3de05f9df1c02b83fb SHA512 189f792664e30a0d60c618b902c393a4af570bea38810001aa759acae27fbb625389576eb3923678fddaca806b946e99e0444738b24aa3124e988bbc2ab1552b WHIRLPOOL 10e549b9d3461252c6213a35145a2f158d67613733bf89b9c939d3eac7b77080b6886a3386e9a6358f31ad6ffe4e0c35ed9cfc025294392aeff5f4b9e15d987c
diff --git a/mail-filter/rmilter/rmilter-1.7.4.ebuild b/mail-filter/rmilter/rmilter-1.7.4.ebuild
new file mode 100644
index 000000000000..6c033267452d
--- /dev/null
+++ b/mail-filter/rmilter/rmilter-1.7.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Another sendmail milter for different mail checks"
+SRC_URI="https://github.com/vstakhov/rmilter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/vstakhov/rmilter"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libpcre
+		dev-libs/openssl:0
+		mail-filter/libmilter
+		mail-filter/opendkim"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup rmilter
+	enewuser rmilter -1 -1 /var/run/rmilter rmilter
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rmilter.initd" rmilter
+	insinto /etc/rmilter
+	newins rmilter.conf.sample rmilter.conf.sample
+	newins rmilter-grey.conf rmilter-grey.conf
+}
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index c4d65d77ef31..99160f68ca36 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
 DIST rspamd-1.1.3.tar.xz 1357696 SHA256 8604e980a81d6586d18d02f90236c83384754ef1debce0b4f0ca32f87e1ec135 SHA512 42152dd64f6265e3a17d6d53b041ded3b4a262e4d63237bc11e21dca96a4946334ab33c13fffa779b95717ed48629a9cc7a79f1af897d4dd3a831f7c121061ed WHIRLPOOL f9164ff3373bc928414b49d27fedff1d2990f4e01646f4959d759d9b3e4737aa77cced4de9bd9f8548145729fbdb765da78295b2d2e610c0f2bedb29b29ebd73
+DIST rspamd-1.1.4.tar.xz 1357172 SHA256 7186d0448aaddc1e347af580e7ec14e34ff38859db99bf2173139a6bbc18821d SHA512 de4afb82beba9d8d28a6cf6d7eb222806671fcca51114b9668fe0484c5a2b0680763d3fe6095cb7d4b301991a5f17effef6cfbf70d6d98c8e79476bbdb8b6ee3 WHIRLPOOL 0dab7e399a9319e82c1cacbf856cf4977376f78b12aa7de563912f6a5ed6280a8ec2b2bd0a07fe46dc684112b725717fb4fb9031b9d9d69ac2da59ba98724dea
diff --git a/mail-filter/rspamd/rspamd-1.1.4.ebuild b/mail-filter/rspamd/rspamd-1.1.4.ebuild
new file mode 100644
index 000000000000..5656b031ce36
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-1.1.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils user
+
+DESCRIPTION="Rapid spam filtering system"
+SRC_URI="https://rspamd.com/downloads/${P}.tar.xz"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+jit"
+
+DEPEND="dev-libs/openssl:0
+		jit? (
+			dev-libs/libpcre[jit]
+			dev-lang/luajit:2
+		)
+		!jit? (
+			dev-libs/libpcre[-jit]
+			>=dev-lang/lua-5.1:0
+		)
+		dev-libs/libevent
+		dev-db/sqlite:3
+		dev-libs/glib:2
+		dev-libs/gmime
+		sys-apps/file
+		virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup rspamd
+	enewuser rspamd -1 -1 /var/lib/rspamd rspamd
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}/rspamd.init-r1" rspamd
+
+	dodir /var/lib/rspamd
+	dodir /var/log/rspamd
+
+	fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/rspamd.logrotate" rspamd
+}
diff --git a/mail-mta/exim/exim-4.86-r2.ebuild b/mail-mta/exim/exim-4.86-r2.ebuild
index e85c58303bf2..afad1483e3e5 100644
--- a/mail-mta/exim/exim-4.86-r2.ebuild
+++ b/mail-mta/exim/exim-4.86-r2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 2fb3a424ecca..8c8aede56751 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,5 +2,7 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb
 DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483
 DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
 DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
+DIST postfix-3.0.4.tar.gz 4240805 SHA256 b81ce81176b9df7183ad99b9c98000135f5e88e659493ab50db5d9fe5b8dba0e SHA512 ca1ad1b7a0c552825d820e1ea017bdd79cf31e6262c9d2b801fa11011be5e10549cfb57745cec4177046a178fab104f3b7f79bf08708bb7772b127970970949d WHIRLPOOL e1a00ba9733522109ebbefa902021abda3bed0316da98cfb98a305122e736f5889b8b5a6426f152d0c68a9f8cb675683fddb80fd12fa6b278f1ae8c024c5fc1c
 DIST postfix-3.1-20160214.tar.gz 4326879 SHA256 342d72db2b2a95dbc84a85bd767874b95d17e1a0428397911ed3b72176c0993a SHA512 383c613f2ecff0115d752a641480412fd8fc706392e52624122254d625906c377136834bc4cf633fc5d840eb638e7667b8ac81d63fc0bdc3ef19f9cb5121a732 WHIRLPOOL 97db84fe14b5970468d22b5601539ac6c48223305c68edc3232047c94c527eaf07dfb3b30e11962b9d448f130d39875d99f3d719d13ba0ccba20a8e086804985
+DIST postfix-3.2-20160221.tar.gz 4328066 SHA256 f9cd8af9bde5b5b10ce401ef69da5344da1c6d12d34c90e5215972a339de0eb6 SHA512 3be6f1cf53f18c0df129794338e3bef12357290fcbc9bddd04d64425e13f45bb4ad8282d5d8eefacf4d56a444bc09adb22f719935d83181d03bc131b28c67c10 WHIRLPOOL b3b4a8d3bb7a497b084b4c6426208c646f7e291a51977ab0572c396b4c217650d15ffef720b65392658794e1cd9eecd169d40d031589bba8b5be38521c6cd40e
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-3.0.4.ebuild b/mail-mta/postfix/postfix-3.0.4.ebuild
new file mode 100644
index 000000000000..9cbe08f78cdb
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.0.4.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.10.0"
+VDA_P="${PN}-vda-v13-${VDA_PV}"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+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 )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+# No vda support for postfix-3.0
+REQUIRED_USE="ldap-bind? ( ldap sasl )
+		!vda"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	if use vda; then
+		epatch "${DISTDIR}"/${VDA_P}.patch
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape tool and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Remove unnecessary files
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+}
diff --git a/mail-mta/postfix/postfix-3.2_pre20160221.ebuild b/mail-mta/postfix/postfix-3.2_pre20160221.ebuild
new file mode 100644
index 000000000000..790c62efd05d
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.2_pre20160221.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib pam systemd toolchain-funcs user versionator
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+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 )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+
+	epatch_user
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape and posttls-finger
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Keep config_dir clean
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	[ "${EROOT}" == "/" ] && pkg_config
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+}
+
+pkg_config() {
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"usr/sbin/postfix tls all-default-client ; then
+			elog "Configuring client side TLS settings"
+			"${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"usr/sbin/postfix tls all-default-server ; then
+			elog "Configuring server side TLS settings"
+			"${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/mate-base/mate/mate-1.10.0-r1.ebuild b/mate-base/mate/mate-1.10.0-r2.ebuild
similarity index 98%
rename from mate-base/mate/mate-1.10.0-r1.ebuild
rename to mate-base/mate/mate-1.10.0-r2.ebuild
index 133f3c6ed0aa..930c145e1967 100644
--- a/mate-base/mate/mate-1.10.0-r1.ebuild
+++ b/mate-base/mate/mate-1.10.0-r2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
 	themes? (
 		=x11-themes/mate-backgrounds-${MATE_MV}*:0
 		=x11-themes/mate-icon-theme-${MATE_MV}*:0
-		=x11-themes/mate-themes-${MATE_MV}*:0
+		=x11-themes/mate-themes-meta-${MATE_MV}*:0
 	)
 	extras? (
 		=app-arch/engrampa-${MATE_MV}*:0
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
index b5a915f400da..8b104f715dd6 100644
--- a/mate-extra/caja-extensions/metadata.xml
+++ b/mate-extra/caja-extensions/metadata.xml
@@ -6,6 +6,7 @@
         <name>Gentoo MATE Desktop</name>
     </maintainer>
 	<use>
+		<flag name="cdr">Add an extension to burn files to cds using <pkg>app-cdr/brasero</pkg>.</flag>
 		<flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
 		<flag name="image-converter">Add image conversion support.</flag>
 		<flag name="mail">Add an extension to support e-mail functionality.</flag>
diff --git a/media-fonts/cantarell/cantarell-0.0.22.ebuild b/media-fonts/cantarell/cantarell-0.0.22.ebuild
index 45f7fb71242d..daa3b3297108 100644
--- a/media-fonts/cantarell/cantarell-0.0.22.ebuild
+++ b/media-fonts/cantarell/cantarell-0.0.22.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/fontconfig"
diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
index b3261ba34969..f9cf09ce38b3 100644
--- a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
+++ b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # Tests need valgrind, that needs glibc with debugging symbols
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
index 500c9c8179f6..e48eea90c119 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="+exif +flickr map +picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog/eog-3.18.2.ebuild b/media-gfx/eog/eog-3.18.2.ebuild
index 3e606017bb25..8c8aa2657dbc 100644
--- a/media-gfx/eog/eog-3.18.2.ebuild
+++ b/media-gfx/eog/eog-3.18.2.ebuild
@@ -16,7 +16,7 @@ SLOT="1"
 IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2[dbus]
diff --git a/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
index 98340a3537eb..c52994cfde4c 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
index e2d3c37bb85a..181254b8d638 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 COMMON_DEPEND="
diff --git a/media-gfx/gphoto2/gphoto2-2.5.9.ebuild b/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
index b94a9c0da8ac..b7103ddc8a86 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/llgal/llgal-0.13.17-r1.ebuild b/media-gfx/llgal/llgal-0.13.17-r2.ebuild
similarity index 93%
rename from media-gfx/llgal/llgal-0.13.17-r1.ebuild
rename to media-gfx/llgal/llgal-0.13.17-r2.ebuild
index a36320d7a6c5..bb94239e8453 100644
--- a/media-gfx/llgal/llgal-0.13.17-r1.ebuild
+++ b/media-gfx/llgal/llgal-0.13.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ for i in ${LINS}; do
 done
 
 RDEPEND="media-gfx/imagemagick
-	 dev-perl/ImageSize
+	 dev-perl/Image-Size
 	 dev-perl/URI
 	 dev-perl/Locale-gettext
 	 exif? ( media-libs/exiftool )"
diff --git a/media-gfx/simple-scan/simple-scan-3.18.2.ebuild b/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
index a60ff942d5e8..2f6865aa6902 100644
--- a/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="colord"
 
 COMMON_DEPEND="
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild
index 05360180a15b..aa46d6b126a6 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X examples +introspection udev"
 
 # >=cogl-1.18 provides cogl-2.0-experimental
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild
index dfdf56326a23..c6f7f8f779e4 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
 LICENSE="LGPL-2.1+"
 
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X examples gtk +introspection wayland"
 
 RDEPEND="
diff --git a/media-libs/clutter/clutter-1.24.2.ebuild b/media-libs/clutter/clutter-1.24.2.ebuild
index 48b6a355ef4f..c0478120dd3c 100644
--- a/media-libs/clutter/clutter-1.24.2.ebuild
+++ b/media-libs/clutter/clutter-1.24.2.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	|| ( aqua wayland X )
 	wayland? ( egl )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # >=libX11-1.3.1 needed for X Generic Event support
diff --git a/media-libs/cogl/cogl-1.22.0-r2.ebuild b/media-libs/cogl/cogl-1.22.0-r2.ebuild
index eb8ad4a3cc84..c7028a034c40 100644
--- a/media-libs/cogl/cogl-1.22.0-r2.ebuild
+++ b/media-libs/cogl/cogl-1.22.0-r2.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	wayland? ( gles2 )
 	|| ( gles2 opengl )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/media-libs/elementary/Manifest b/media-libs/elementary/Manifest
index ded23c4e0237..197eb035c64b 100644
--- a/media-libs/elementary/Manifest
+++ b/media-libs/elementary/Manifest
@@ -1,3 +1,4 @@
 DIST elementary-1.12.2.tar.bz2 16726431 SHA256 c6aa5e83224400babdd2a6ed848eeb09aa9bed2e1f573619d4d8c0dbf29fcd12 SHA512 05c9fb012bd933fe52978d0bdec7d80be06a54531d6c026de0cd32c7ba218c2c9960ed6c5f5aa94360c88a4465dbd3b8df7d92e73bc6bb754493b44825858232 WHIRLPOOL 97666a5072e280a613f21b3c32566b6a47a0d5a46fbe4983ec3e40c35bba6bd1f5d8f4d09557023494a9eaa89dc14711b8cc007d81e4c19881601955c1acf3df
 DIST elementary-1.15.2.tar.xz 18514048 SHA256 523c3073210b611817d0f56aa8348962ec757282f9f7dfde93825afa164a0f3f SHA512 7ee796898aee7667e0ae6e8e7d1a604287fc9b009a7a3f4ab75c15b10160e0a38975dfbf6586c20ad2fdc8075dd867287d4d5617ad6b6be2e522c74beb03ce38 WHIRLPOOL 6d42e6063c8d697d237b003781f33e6b3bf562c2785458cd3cf1cf84319325ac1ff39704e33bae641610b1ff669b2fe115135a5f939eca0314a25ee7a6a6bf0a
 DIST elementary-1.16.1.tar.xz 18536148 SHA256 7e3863640a9c6dff91d62a06a3119c6c6682247e4669583033b80c7d608da860 SHA512 fa5dce7c40be55f57e145ee459df5452b946b3701fe61f2f160e90c65720bcb1c24730b6fec9892c51d29af3d2898f38c8cbce83225b00e2aec5a27cb3081a5f WHIRLPOOL 6d0f1d40e91de42eb42552fa6c39578d8577f47e0ee2028f32e4e625b25a32ee229f7129f5ec4b6d54787ff669f8f3b5b0ca26e6334475565440a36f982381cd
+DIST elementary-1.17.0.tar.xz 18491592 SHA256 6a6a5883939eab8d87179c7980c0dbd6b53d82bf460a161045a891694d036b2b SHA512 60862e164770a93c0b864f35b5880f8d28f9fec520b7b440935143a14ffc9cd2dacbb650463c2abb7ce364c631509e1ddefce6eb49def1b016a752416d619065 WHIRLPOOL 76499e687908b8c2c885429c614a493b226f5e2d73edc040a5d6e8e287dab3b342b517fa46e4a37ca6560e4a9c617415d8138da1308865aa5d07187d60c7ea61
diff --git a/media-libs/elementary/elementary-1.17.0.ebuild b/media-libs/elementary/elementary-1.17.0.ebuild
new file mode 100644
index 000000000000..a719301834b2
--- /dev/null
+++ b/media-libs/elementary/elementary-1.17.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices"
+HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary"
+
+LICENSE="LGPL-2.1"
+IUSE="debug examples fbcon javascript quicklaunch sdl wayland X static-libs"
+
+DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]
+	javascript? ( net-libs/nodejs )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	E_ECONF=(
+		$(use_enable debug)
+		$(use_enable doc)
+		--disable-ecore-cocoa
+		--disable-ecore-psl1ght
+		--disable-ecore-win32
+		--disable-elocation
+		--disable-emap
+		--disable-eweather
+		# broken: make[4]: *** No rule to make target 'prefs_example_01.epb', needed by 'all-am'.  Stop
+		#$(use_enable examples build-examples)
+		$(use_enable examples install-examples)
+		$(use_enable fbcon ecore-fb)
+		$(use_enable javascript js-bindings)
+		$(use_enable sdl ecore-sdl)
+		$(use_enable wayland ecore-wl2)
+		$(use_enable X ecore-x)
+		$(use_enable quicklaunch quick-launch)
+	)
+
+	enlightenment_src_configure
+}
diff --git a/media-libs/elementary/elementary-9999.ebuild b/media-libs/elementary/elementary-9999.ebuild
index 7cef5b066732..a719301834b2 100644
--- a/media-libs/elementary/elementary-9999.ebuild
+++ b/media-libs/elementary/elementary-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,9 +20,10 @@ DESCRIPTION="Basic widget set, based on EFL for mobile touch-screen devices"
 HOMEPAGE="https://trac.enlightenment.org/e/wiki/Elementary"
 
 LICENSE="LGPL-2.1"
-IUSE="debug examples fbcon quicklaunch sdl wayland X static-libs"
+IUSE="debug examples fbcon javascript quicklaunch sdl wayland X static-libs"
 
-DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]"
+DEPEND=">=dev-libs/efl-${PV}[fbcon?,sdl?,png,wayland?,X?]
+	javascript? ( net-libs/nodejs )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -41,8 +42,9 @@ src_configure() {
 		#$(use_enable examples build-examples)
 		$(use_enable examples install-examples)
 		$(use_enable fbcon ecore-fb)
+		$(use_enable javascript js-bindings)
 		$(use_enable sdl ecore-sdl)
-		$(use_enable wayland ecore-wayland)
+		$(use_enable wayland ecore-wl2)
 		$(use_enable X ecore-x)
 		$(use_enable quicklaunch quick-launch)
 	)
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 2e16ad133833..8abc2f38264b 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -2,4 +2,5 @@ DIST Image-ExifTool-10.00.tar.gz 4013694 SHA256 7b573331eba3921b56339018e95dd5e6
 DIST Image-ExifTool-10.07.tar.gz 4035921 SHA256 012ac8bf1b48b78d3f09b17d172765956968423f0ded737f8e0a6cf3f3316218 SHA512 3a93902a6b1bcc72b425c76ad1b34ea8d8e681787421bdb37130825cd9222758196acdd453ac63858d228da019e70c738417088b5f0139704d0e299331f72c09 WHIRLPOOL a2904e08e156f331a1bb8249494c798c2d6cf16434974a341c73374303e7f1756753f435fd108e8104026c5a0f87e94629566d321b1d329132cee056ab9017d5
 DIST Image-ExifTool-10.09.tar.gz 4041349 SHA256 b6e621bfd2de6ea6c16bd7ee709f6c7ec47344c70de39b8c5c911e4ac930cad5 SHA512 cc814850ab01d1eaf00614355c689682d04dffa88f65f75308861954a9c4f1bf4a347624b1068b81050ecafa9043701941e6d53914b2a5892f2e336a18c24e5d WHIRLPOOL 2d7ad180004dadd7cced67f438e6d75f7697072770e2e4530131e31ca75e45acc0d28d6c4459681ee11eca5a0e86afe7dafd518c293a3fe9c0ababbd0e72bd61
 DIST Image-ExifTool-10.10.tar.gz 4056189 SHA256 f9fcecf8954cfd6b1f5658e1fc82801e8b98f891c88a60adbd6bc5c716471e09 SHA512 c18963020f02f196c68d89d22126834dbde31b2e13da0b56509d1d25f9adb6248f8e4ea9ec7cba7f144a44d6c81e966e9aafd36d4e2d76d92e3b7a0c7e4fdacd WHIRLPOOL e5bd0791dfc7fa4b16d4ee770d866626a119cf68b8e2736cda1181a2fcb7a32e96ad885a706d25da0241bd9ba1c0637c23be49e5662fe813fa8fb48b4100768c
+DIST Image-ExifTool-10.11.tar.gz 4060513 SHA256 8cf8b2ec192fdbec5e1946bcf1ed9c7c681e6d16896298bbf7adb8eb59356729 SHA512 c61f70782fbe9f7ce55fb1e0a66aaa0310be17b483b39505ba6255964798d46a8887254a9f635abfc5edc544b3c52cf180575ba7ccf72b4ed209608f78d4e427 WHIRLPOOL 5cbed0ea1516760339cfd93c6f3a73eda9b4413b58a7871c604da61bd0d484f6c6772ea1efa31d6b5d5a8da2d23fe1de4a81469bcc32eb28bb5122ff8134be98
 DIST Image-ExifTool-9.98.tar.gz 4002089 SHA256 cf7e89b40e942ff582b06b958edfce2e2c7ba2986a650212a96fa74cf5bbc74b SHA512 138bcf0aeab6fe893df3f051ca9d5d2e7fabbfb19e6b68ee0529515c1e6f6d89d75ca8aacabfb7edc2e380caa04f8bb97536ef284b0bf140edfcf9c8363a482c WHIRLPOOL edb5c4799079b27a008ebb95e2ae13ec2c37cb123f3664582f6ddc8a0b3cb351410d12b2c1d5352a10a4213c8e7fcc591f64fb514c83bbecdf582780f27a0237
diff --git a/media-libs/exiftool/exiftool-10.11.ebuild b/media-libs/exiftool/exiftool-10.11.ebuild
new file mode 100644
index 000000000000..0d48581c279e
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=Image-ExifTool
+MY_P=${MY_PN}-${PV}
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dohtml -r html/
+}
diff --git a/media-libs/grilo/grilo-0.2.15.ebuild b/media-libs/grilo/grilo-0.2.15.ebuild
index e87bbcf01188..1b474bbe8715 100644
--- a/media-libs/grilo/grilo-0.2.15.ebuild
+++ b/media-libs/grilo/grilo-0.2.15.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gtk examples +introspection +network playlist test vala"
 REQUIRED_USE="test? ( introspection )"
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
index d9f8dafa274f..6d5ad2b49abb 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="X egl gles2 gtk +introspection opengl +orc vcd vnc wayland"
 REQUIRED_USE="
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
index 8a4b31acb42b..00acd6293af6 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
 REQUIRED_USE="
 	ivorbis? ( ogg )
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
index a1db969f2d21..548bd516b026 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 # dtmf plugin moved from bad to good in 1.2
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
index 15e8d22b0720..9de5a7078cfe 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild
index 71a6596d6952..2a9e33c8c13b 100644
--- a/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.6.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A GStreamer based RTSP server"
 HOMEPAGE="http://people.freedesktop.org/~wtay/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples +introspection static-libs test"
 
 # FIXME: check should depend on USE=test but check is losy
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
index 3ffda41adfa6..3ebdd9a7cc7e 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection"
 
 # FIXME: There is something odd with pygobject check for >=4.22,
diff --git a/media-libs/gstreamer/gstreamer-1.6.3.ebuild b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
index 1409bf676d2e..50d8049cdcd6 100644
--- a/media-libs/gstreamer/gstreamer-1.6.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection nls +orc test"
 
 RDEPEND="
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
index 7ab3dd1db9ed..de13a357bc7a 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
index 11e371fb7ad8..3ac3b49a16f3 100644
--- a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch b/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch
new file mode 100644
index 000000000000..e32f3fe8a668
--- /dev/null
+++ b/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch
@@ -0,0 +1,32 @@
+From 882a4b3f83a4b5097da53670c720a26f4e2750eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Sun, 13 Dec 2015 20:37:16 +0100
+Subject: [PATCH] Some boost 1.59 fixes
+
+Change-Id: I0054c977a6d8ff5a9b93c147578e890476365999
+---
+ src/lib/Makefile.am | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 3f00cc5..e14fa8c 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -13,8 +13,16 @@ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
+ 	$(top_srcdir)/inc/libcdr/CDRDocument.h \
+ 	$(top_srcdir)/inc/libcdr/CMXDocument.h
+ 
+-AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
++AM_CXXFLAGS = -I$(top_srcdir)/inc \
++	$(REVENGE_CFLAGS) \
++	$(LCMS2_CFLAGS) \
++	$(ZLIB_CFLAGS) \
++	$(ICU_CFLAGS) \
++	$(DEBUG_CXXFLAGS) \
++	-DLIBCDR_BUILD=1 \
++	-DBOOST_ERROR_CODE_HEADER_ONLY \
++	-DBOOST_SYSTEM_NO_DEPRECATED
+ 
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = @LIBCDR_WIN32_RESOURCE@
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
diff --git a/media-libs/libcdr/libcdr-0.1.0.ebuild b/media-libs/libcdr/libcdr-0.1.0.ebuild
index 3484f9b3c89e..da99f3dc091e 100644
--- a/media-libs/libcdr/libcdr-0.1.0.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.0.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
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
@@ -32,9 +32,10 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	base_src_prepare
+	epatch "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
+	epatch_user
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-libs/libcdr/libcdr-0.1.1.ebuild b/media-libs/libcdr/libcdr-0.1.1.ebuild
index 158c828fc6cd..c7dba09ebc06 100644
--- a/media-libs/libcdr/libcdr-0.1.1.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.1.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
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
@@ -32,9 +32,10 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	base_src_prepare
+	epatch "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
+	epatch_user
 	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-libs/libcdr/libcdr-0.1.2.ebuild b/media-libs/libcdr/libcdr-0.1.2-r1.ebuild
similarity index 91%
rename from media-libs/libcdr/libcdr-0.1.2.ebuild
rename to media-libs/libcdr/libcdr-0.1.2-r1.ebuild
index b0fd8db6ef5a..d818832699f5 100644
--- a/media-libs/libcdr/libcdr-0.1.2.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.2-r1.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	base_src_prepare
+	eapply_user
 	[[ -d m4 ]] || mkdir "m4"
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild
index b0fd8db6ef5a..d818832699f5 100644
--- a/media-libs/libcdr/libcdr-9999.ebuild
+++ b/media-libs/libcdr/libcdr-9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-2
+inherit eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing the Corel cdr documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	base_src_prepare
+	eapply_user
 	[[ -d m4 ]] || mkdir "m4"
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
diff --git a/media-libs/libchamplain/libchamplain-0.12.12.ebuild b/media-libs/libchamplain/libchamplain-0.12.12.ebuild
index 9eb401a9dbb7..37f71c37ea9b 100644
--- a/media-libs/libchamplain/libchamplain-0.12.12.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.12.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="debug +gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
index ef50b4e554ec..c8d0eba37fa0 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
 
 LICENSE="Flashpix"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="static-libs"
 
 S=${WORKDIR}/${P/_p/-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
index 2e949f98d7f2..a0b67abb37c0 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index 88298e9c2a20..dcd05d530579 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,3 +1,4 @@
 DIST libvisio-0.0.30.tar.xz 384508 SHA256 e7be89fdef23483deea53a557fe023c9f6b59e0f7bb5ba4f42b5909c86cc11f9 SHA512 d0261f30ca9065873aa498f7594a638d0a90dadd4df609a91e746579d14b5f1f18aa4e4812d25870b390f2df59ffa8f8a4d76618c6e71539023b7610044c9d21 WHIRLPOOL 1e328569f3e810c6cc1399015b7fb5b4aa206e0127109efaad23163fba8d45a4a74945ff6cca3dcc883dcd1248be69149383a2d9f44fb5be213ebfcd2574a92e
 DIST libvisio-0.1.1.tar.xz 412752 SHA256 4b510168d1465516fdf6e57c01e2f9eae1fc0ae232c74e44e70693bbc49227f1 SHA512 c17c3a94985bd4c6fb10fc27d1b61ac812d5b663d123d2a5a5089f9297d39c53befffd563e6367aa024df7f69c03a1cfa41edef71c824cf03e26e3b01987dd38 WHIRLPOOL 47b81e6f4ad9f6267113d259f3d9514751fd73a731ded9b265dddbaa918bee5be1a1580ced9ceb287822ee8a67841f15ca06e04d300212301ae5549625589cfa
 DIST libvisio-0.1.3.tar.xz 479592 SHA256 943e03b1e6c969af4c2133a6671c9630adf3aaf8d460156744a28f58c9f47cd8 SHA512 aa7ea66d30b54e70acd6684a861923dd5979025e5fda12e1e777c6e7a461f9691f2df1dd67ea4599dbb7e0293df0eee9dc9848f79067c4058afb090717489d35 WHIRLPOOL db483c052f69d1874681d36bac98bb7d65f6fd1cd2e8650fc2be0be1705b51dc43a79ad306eafacf11f4463e2e1a18776c3b5e5b0aefc7f92f5eb718aee50e04
+DIST libvisio-0.1.5.tar.xz 504196 SHA256 430a067903660bb1b97daf4b045e408a1bb75ca45e615cf05fb1a4da65fc5a8c SHA512 094ab546f650840d52fc34c1b105eff139d2f6e4d5cab7c9c99f8387ece0d0c6b02ec1376b3281d56a901bac016c2a024bb708c065b8b5d9404104e6494b5fab WHIRLPOOL ee2c67f357a3cc907b78e3cb8c6001ff1da2529d61f691dbad634f15639ff22a72bbec7deae08166ccaa4acfb730a826d96b9f1567e1c7c830ded1dc130388f3
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch b/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch
new file mode 100644
index 000000000000..f7e703552f4d
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch
@@ -0,0 +1,25 @@
+From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 18 Jan 2016 13:53:19 +0100
+Subject: [PATCH] tdf#92396 test must be run in specific time zone
+
+Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402
+---
+ src/test/Makefile.am |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am
+index 59d3419..23049b5 100644
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -29,4 +29,7 @@ EXTRA_DIST = \
+ 	     data/dwg.vsdx \
+ 	     $(test_SOURCES)
+ 
++# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string
++AM_TESTS_ENVIRONMENT = TZ=CET; export TZ;
++
+ TESTS = test
+-- 
+1.7.9.5
+
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
new file mode 100644
index 000000000000..78eb9fe66bc9
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac	2015-07-25 09:29:53.000000000 +0200
++++ b/configure.ac	2016-02-07 00:19:30.534383076 +0100
+@@ -317,6 +317,9 @@
+ )
+ AS_IF([test "x$enable_tests" = "xyes"], [
+     PKG_CHECK_MODULES([CPPUNIT], [cppunit])
++    PKG_CHECK_MODULES([REVENGE_STREAM],[
++        librevenge-stream-0.0
++    ])
+ ], [])
+ AC_SUBST([CPPUNIT_CFLAGS])
+ AC_SUBST([CPPUNIT_LIBS])
diff --git a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
index 0770f0fd1d4a..8c2449a7e3c1 100644
--- a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.3-r1.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
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing the visio documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
@@ -33,12 +33,18 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-tests.patch"
+	"${FILESDIR}/${P}-fix-importtest.patch"
+	"${FILESDIR}/${P}-tests-without-tools.patch"
+	"${FILESDIR}/${P}-boost-1.59.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-tests.patch" \
-		"${FILESDIR}/${P}-boost-1.59.patch"
+	epatch "${PATCHES[@]}"
+	epatch_user
 	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-libs/libvisio/libvisio-0.1.3.ebuild b/media-libs/libvisio/libvisio-0.1.5.ebuild
similarity index 81%
rename from media-libs/libvisio/libvisio-0.1.3.ebuild
rename to media-libs/libvisio/libvisio-0.1.5.ebuild
index 591d1b34eb80..c2ac25fe1375 100644
--- a/media-libs/libvisio/libvisio-0.1.3.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.5.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
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit base eutils
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+inherit autotools eutils
+[[ ${PV} == 9999 ]] && inherit git-r3
 
 DESCRIPTION="Library parsing the visio documents"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
@@ -25,6 +25,7 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	>=dev-libs/boost-1.46
 	dev-util/gperf
 	sys-devel/libtool
@@ -33,10 +34,13 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.1.3-tests-without-tools.patch" )
+
 src_prepare() {
+	eapply "${PATCHES[@]}"
+	eapply_user
 	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
-	[[ ${PV} == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-libs/libvisio/libvisio-9999.ebuild b/media-libs/libvisio/libvisio-9999.ebuild
index 591d1b34eb80..0adbb1cda8e2 100644
--- a/media-libs/libvisio/libvisio-9999.ebuild
+++ b/media-libs/libvisio/libvisio-9999.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
+EAPI=6
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
-inherit base eutils
+inherit eutils
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="Library parsing the visio documents"
@@ -25,6 +25,7 @@ RDEPEND="
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	>=dev-libs/boost-1.46
 	dev-util/gperf
 	sys-devel/libtool
@@ -34,8 +35,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	eapply_user
 	[[ -d m4 ]] || mkdir "m4"
-	base_src_prepare
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index c2ecf5673f09..ffbcc86eb361 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,6 +3,5 @@ DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1
 DIST mesa-11.0.6.tar.xz 7272972 SHA256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 SHA512 946a66803395ef0f4d3b328e981e03a87bb5173a523be5da1dd3363002fceacd8dcbfdbf9716e31bb4247b23cc5ef112b24bb4ef0709b514bc8160c6cbf1dbf3 WHIRLPOOL 19729acb5fbbcff3a99b4d7644750dff4a7a2d41c3f25f2e004938faf0c72abd33e97f5d23d2804f84b957824757b5f64f3a7f54a2dd8999b2a71eb9b1976e0b
 DIST mesa-11.0.8.tar.xz 7282812 SHA256 5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75 SHA512 2e883761b115dece05c527d43653e5169e70ef0d8f0f9fe35027986ca543128b17be668d495cacda4ee95564ba66734ea9954d2434aefaeb9c063f4bbedc1d63 WHIRLPOOL 3a637137076d0fc8ef3f37485683be80103ce6c5a92cef796e491d570aa47aa1ca16fca1b7b74ba697a3a816a5e606d695d0b3b524587e14533d9143830a1790
 DIST mesa-11.0.9.tar.xz 7282648 SHA256 a1262ff1c66a16ccf341186cf0e57b306b8589eb2cc5ce92ffb6788ab01d2b01 SHA512 8bf9c3bfe61f5d22182b9611d66051d83dfb302cc349921bc1d895acc8681b3e22e77cb360e2f12383fd928793b306f8f98998caa457dc04e3ff4e5561ea78f7 WHIRLPOOL a3477542b5ebfed9b69bd29e7f58a01b02c70d49399afb873744de08e776d712eaca3443f88dbdee25b1d3d35a4eb9dae75a3b9d7d6d652d41cded763836c59a
-DIST mesa-11.1.1.tar.xz 7561216 SHA256 64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20 SHA512 1d41bb4e58042230a38784477c425a2517ef57b17055413884dfb1b7a635a7d8ec68b9be705cbd5608910d75d73988d7c18467c779c48547c5c533750e722521 WHIRLPOOL 78d1c0b42e08c7149c1e97d9c45216102cba73f96ab96355f8b470faa45532312c3e7c791d98bce4aeaa776cec9a103ca904fb28828b5b172a7de3973809a1d1
 DIST mesa-11.1.2.tar.xz 7561920 SHA256 8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b SHA512 4037728cbe7c5c492cf1e6d20c61250c0ff4fe82cf89ba1cd6ff029776220160359dce197582d2c3f3f7ba5d76fe6b055515210fc46b59f821fc66f453cb77ae WHIRLPOOL e7a848f542c13eae1a79c89a6bff3fbc0c82041924f1cbecac7eaba6363edebfce568353829c41eb38c0c309e0aa35f36027b0dca262ed54d6627542d74f6bca
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch b/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch
new file mode 100644
index 000000000000..87ad498a0eb0
--- /dev/null
+++ b/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch
@@ -0,0 +1,47 @@
+From 1c145df858ba5ab539386692d9350909fb8f8c82 Mon Sep 17 00:00:00 2001
+From: Jason Ekstrand <jason.ekstrand@intel.com>
+Date: Wed, 10 Feb 2016 12:07:49 -0800
+Subject: [PATCH] nir/lower_vec_to_movs: Better report channels handled by
+ insert_mov
+
+This fixes two issues.  First, we had a use-after-free in the case where
+the instruction got deleted and we tried to return mov->dest.write_mask.
+Second, in the case where we are doing a self-mov of a register, we delete
+those channels that are moved to themselves from the write-mask.  This
+means that those channels aren't reported as being handled even though they
+are.  We now stash off the write-mask before remove unneeded channels so
+that they still get reported as handled.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94073
+Reviewed-by: Matt Turner <mattst88@gmail.com>
+Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
+(cherry picked from commit 70dff4a55e767de8b9ce10f055b94ebb1f6a9755)
+---
+ src/glsl/nir/nir_lower_vec_to_movs.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/glsl/nir/nir_lower_vec_to_movs.c b/src/glsl/nir/nir_lower_vec_to_movs.c
+index 736a66c..0783596 100644
+--- a/src/glsl/nir/nir_lower_vec_to_movs.c
++++ b/src/glsl/nir/nir_lower_vec_to_movs.c
+@@ -83,6 +83,8 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
+       }
+    }
+ 
++   unsigned channels_handled = mov->dest.write_mask;
++
+    /* In some situations (if the vecN is involved in a phi-web), we can end
+     * up with a mov from a register to itself.  Some of those channels may end
+     * up doing nothing and there's no reason to have them as part of the mov.
+@@ -103,7 +105,7 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
+       ralloc_free(mov);
+    }
+ 
+-   return mov->dest.write_mask;
++   return channels_handled;
+ }
+ 
+ static bool
+-- 
+2.4.10
+
diff --git a/media-libs/mesa/mesa-11.1.1.ebuild b/media-libs/mesa/mesa-11.1.1.ebuild
deleted file mode 100644
index 2f072fbaf227..000000000000
--- a/media-libs/mesa/mesa-11.1.1.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
-	wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	llvm? ( !kernel_FreeBSD? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		) )
-		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				!kernel_FreeBSD? ( || (
-					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openmax omx)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-read-only-text, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	if ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-11.1.2.ebuild b/media-libs/mesa/mesa-11.1.2-r1.ebuild
similarity index 99%
rename from media-libs/mesa/mesa-11.1.2.ebuild
rename to media-libs/mesa/mesa-11.1.2-r1.ebuild
index 2f072fbaf227..7dd5cc6f9a82 100644
--- a/media-libs/mesa/mesa-11.1.2.ebuild
+++ b/media-libs/mesa/mesa-11.1.2-r1.ebuild
@@ -190,6 +190,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11.1.2-i965-fix-use-after-free.patch
+
 	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 86ee2a599465..5804eb029c63 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -3,4 +3,5 @@ DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956f
 DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
 DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
 DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
+DIST opencv-3.1.0_contrib.zip 55182211 SHA256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4 SHA512 f0ceb8d9ed85efe948a40071793d164a82391a462c52ca71a6029e8b119afdab8b1453baaed2cd7d540001559849a62ec4b745d41345db225acff0531c76e762 WHIRLPOOL 589294c849a00426f4c52d07ab652e71e8bbc74efd0878fbaea2e089051fd118217b1a04f33258fcef2abe1729147282eb17a98c5463691aa3fd56af264ea6a0
 DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/opencv-3.1.0-r2.ebuild b/media-libs/opencv/opencv-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..310b4dc3050b
--- /dev/null
+++ b/media-libs/opencv/opencv-3.1.0-r2.ebuild
@@ -0,0 +1,244 @@
+# 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,3_5} )
+
+inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.org"
+
+SRC_URI="
+	mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
+	https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
+	contrib? ( https://github.com/Itseez/${PN}_contrib/archive/${PV}.zip -> ${P}_contrib.zip )"
+
+LICENSE="BSD"
+SLOT="0/3.1" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( qt4 qt5 )
+"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	gtk? ( !qt4 )
+#	opengl? ( || ( gtk qt4 ) )
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gdal? ( sci-libs/gdal )
+	gphoto2? ( media-libs/libgphoto2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		opengl? ( x11-libs/gtkglext )
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
+	ipp? ( sci-libs/ipp )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	opengl? ( virtual/opengl virtual/glu )
+	png? ( media-libs/libpng:0= )
+	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qttest:4
+		opengl? ( dev-qt/qtopengl:4 )
+	)
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+		dev-qt/qtconcurrent:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff:0 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	vtk? ( sci-libs/vtk[rendering] )
+	webp? ( media-libs/libwebp )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )
+	java? ( >=virtual/jdk-1.6 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+
+	epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
+		"${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch"
+
+	# remove bundled stuff
+	rm -rf 3rdparty
+	sed -i \
+		-e '/add_subdirectory(.*3rdparty.*)/ d' \
+		CMakeLists.txt cmake/*cmake || die
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	if use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+
+	# please dont sort here, order is the same as in CMakeLists.txt
+	local mycmakeargs=(
+	# the optinal dependency libraries
+		$(cmake-utils_use_with ieee1394 1394)
+		-DWITH_AVFOUNDATION=OFF # IOS
+		-DWITH_CARBON=OFF # APPLE
+		$(cmake-utils_use_with eigen)
+		$(cmake-utils_use_with ffmpeg)
+		-DWITH_VFW=OFF     # video windows support
+		$(cmake-utils_use_with gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF
+		$(cmake-utils_use_with gtk)
+		-DWITH_GTK_2_X=OFF
+		$(cmake-utils_use_with ipp)
+		$(cmake-utils_use_with java)
+		$(cmake-utils_use_with jpeg2k JASPER)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with webp)
+		$(cmake-utils_use_with opencl)
+		$(cmake-utils_use_with gphoto2)
+		$(cmake-utils_use_with openexr)
+		$(cmake-utils_use_with opengl)
+		$(cmake-utils_use_with openmp)
+		-DWITH_OPENNI=OFF 	#not packaged
+		-DWITH_OPENNI2=OFF	#not packaged
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_build python opencv_python)
+		-DWITH_PVAPI=OFF					# not packaged
+		-DWITH_GIGEAPI=OFF
+		-DWITH_QUICKTIME=OFF
+		-DWITH_WIN32UI=OFF
+		$(cmake-utils_use_with threads TBB)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_PTHREADS_PF=ON
+		$(cmake-utils_use_with tiff)
+		-DWITH_UNICAP=OFF					# not packaged
+		$(cmake-utils_use_with v4l V4L)
+		$(cmake-utils_use_with vtk VTK)
+		-DWITH_LIBV4L=ON
+		-DWITH_DSHOW=ON               # direct show supp
+		-DWITH_MSMF=OFF
+		-DWITH_VIDEOINPUT=OFF					# windows only
+		-DWITH_XIMEA=OFF # windows only
+		$(cmake-utils_use_with xine)
+		-DWITH_CLP=OFF
+		$(cmake-utils_use_with opencl)
+		-DWITH_OPENCL_SVM=OFF
+		$(cmake-utils_use_with opencl OPENCLAMDFFT)
+		$(cmake-utils_use_with opencl OPENCLAMDBLAS)
+		-DWITH_DIRECTX=OFF
+		-DWITH_INTELPERC=OFF
+		-DWITH_IPP_A=OFF
+		-DWITH_MATLAB=ON #default
+		$(cmake-utils_use_with vaapi VA)
+		$(cmake-utils_use_with vaapi VA_INTEL)
+		$(cmake-utils_use_with gdal gdal)
+		#
+		# OpenCV build components
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		$(cmake-utils_use_build doc DOCS)
+		$(cmake-utils_use_build examples)
+		$(cmake-utils_use_build java opencv_java)		#for -java bug #555650
+		-DBUILD_PERF_TESTS=OFF
+		$(cmake-utils_use_build testprograms TESTS)
+	# install examples, tests etc
+		$(cmake-utils_use examples INSTALL_C_EXAMPLES)
+		$(cmake-utils_use testprograms INSTALL_TESTS)
+	# build options
+		$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
+	)
+
+	if use qt4; then
+		mycmakeargs+=( "-DWITH_QT=4" )
+	elif use qt5; then
+		mycmakeargs+=( "-DWITH_QT=5" )
+	else
+		mycmakeargs+=( "-DWITH_QT=OFF" )
+	fi
+
+	if use contrib; then
+		mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-${PV}/modules" )
+	fi
+
+	if use cuda; then
+		mycmakeargs+=( "-DWITH_CUDA=ON" )
+		mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+		mycmakeargs+=( "-DWITH_CUFFT=ON" )
+		mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
+	else
+		mycmakeargs+=( "-DWITH_CUDA=OFF" )
+		mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+		mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+		mycmakeargs+=( "-DWITH_NVCUVID=OFF" )
+	fi
+
+	if use examples && use python; then
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+	else
+		mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+	fi
+
+	# things we want to be hard off or not yet figured out
+	mycmakeargs+=(
+		"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+		"-DBUILD_LATEX_DOCS=OFF"
+		"-DBUILD_PACKAGE=OFF"
+		"-DENABLE_PROFILING=OFF"
+	)
+
+	# things we want to be hard enabled not worth useflag
+	mycmakeargs+=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	# hardcode cuda paths
+	mycmakeargs+=(
+		"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+	)
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-segfault.patch b/media-libs/svgalib/files/svgalib-1.9.25-fix_buffer.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-segfault.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-fix_buffer.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.28.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.28.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-linux2.6.28.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.28.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36-r1.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36-r1.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.36-r1.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_2.6.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-linux_3.4.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
new file mode 100644
index 000000000000..be10e394707a
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-linux_3.9.patch
@@ -0,0 +1,27 @@
+--- svgalib-1.9.25/kernel/svgalib_helper/main.c.orig	2016-02-22 11:10:25.000000000 +0300
++++ svgalib-1.9.25/kernel/svgalib_helper/main.c	2016-02-22 11:17:16.223529679 +0300
+@@ -170,8 +170,12 @@
+ #else
+ static int svgalib_helper_ioctl(struct file *filp, 
+                           unsigned int cmd, unsigned long arg) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) 
++    struct inode *inode=file_inode(filp);
++#else
+     struct inode *inode=filp->f_dentry->d_inode;
+ #endif
++#endif
+ 
+     io_t iov, *user_iov=(io_t *)arg;
+     pcic_t pciv, *user_pciv=(pcic_t *)arg;
+@@ -586,7 +590,11 @@
+ static int svgalib_helper_mmap(struct file *filp, struct vm_area_struct *vma) {
+    unsigned long start=vma->vm_start;
+    unsigned long end=vma->vm_end;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) 
++   unsigned long minor = my_minor(file_inode(filp)->i_rdev);
++#else
+    unsigned long minor = my_minor(filp->f_dentry->d_inode->i_rdev);
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+    unsigned long ofs=vma->vm_pgoff*PAGE_SIZE;
+ #else
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-qa.patch b/media-libs/svgalib/files/svgalib-1.9.25-missing_include.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-qa.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-missing_include.patch
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-build2.patch b/media-libs/svgalib/files/svgalib-1.9.25-vga_reset.patch
similarity index 100%
rename from media-libs/svgalib/files/svgalib-1.9.25-build2.patch
rename to media-libs/svgalib/files/svgalib-1.9.25-vga_reset.patch
diff --git a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
index 2f7f0b82733f..0f64c9a1527e 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,16 +27,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
 	epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698
 	epatch "${FILESDIR}"/${PN}-1.9.25-build.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.28.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
 	epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305
-	epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.36-r1.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-segfault.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-build2.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-qa.patch
-	epatch "${FILESDIR}"/${PN}-1.9.25-kernel3.4.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-missing_include.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch #557052
 	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
 }
 
diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
new file mode 100644
index 000000000000..ca709273a98a
--- /dev/null
+++ b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="A library for running svga graphics on the console"
+HOMEPAGE="http://www.svgalib.org/"
+SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="build +kernel-helper"
+
+MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
+BUILD_TARGETS="default"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.patch
+	"${FILESDIR}"/${PN}-1.9.19-pic.patch
+	"${FILESDIR}"/${PN}-1.9.25-build.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.28.patch
+	"${FILESDIR}"/${PN}-1.9.25-glibc210.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_2.6.36-r1.patch
+	"${FILESDIR}"/${PN}-1.9.25-fix_buffer.patch
+	"${FILESDIR}"/${PN}-1.9.25-vga_reset.patch
+	"${FILESDIR}"/${PN}-1.9.25-missing_include.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_3.4.patch
+	"${FILESDIR}"/${PN}-1.9.25-linux_3.9.patch
+)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+}
+
+src_prepare() {
+	default
+	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
+}
+
+src_compile() {
+	use kernel-helper || export NO_HELPER=y
+
+	export CC=$(tc-getCC)
+
+	# First build static
+	emake OPTIMIZE="${CFLAGS}" static
+	# Then build shared ...
+	emake OPTIMIZE="${CFLAGS}" shared
+	# Missing in some cases ...
+	ln -s libvga.so.${PV} sharedlib/libvga.so
+	# Build lrmi and tools ...
+	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
+		textutils lrmi utils
+	# Build the gl stuff tpp
+	emake OPTIMIZE="${CFLAGS}" -C gl
+	emake OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
+	# Missing in some cases ...
+	ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
+	emake OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV}
+	cp -pPR src/libvga.so.${PV} sharedlib/
+	# Build threeDKit ...
+	emake OPTIMIZE="${CFLAGS}" LDFLAGS+=" -L../sharedlib" \
+		-C threeDKit lib3dkit.a
+	# Build demo's ...
+	emake OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS+=" -L../sharedlib" \
+		demoprogs
+
+	! use build && use kernel-helper && linux-mod_src_compile
+}
+
+src_install() {
+	local x
+
+	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
+
+	emake \
+		TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
+		install
+	! use build && use kernel-helper && linux-mod_src_install
+
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a staticlib/libvga.a
+	dolib.a gl/libvgagl.a
+	dolib.a threeDKit/lib3dkit.a
+	dolib.so gl/libvgagl.so.${PV}
+	local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
+	for x in lib3dkit libvga libvgagl ; do
+		dosym ${x}.so.${PV} /usr/lib/${x}.so
+		dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
+	done
+
+	insinto /usr/include
+	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
+	doins src/keyboard/vgakeyboard.h kernel/svgalib_helper/svgalib_helper.h
+
+	insinto /lib/udev/rules.d
+	newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
+
+	exeinto /usr/lib/svgalib/demos
+	for x in "${S}"/demos/* ; do
+		[[ -x ${x} ]] && doexe ${x}
+	done
+
+	cd "${S}"/threeDKit
+	exeinto /usr/lib/svgalib/threeDKit
+	local THREED_PROGS="plane wrapdemo"
+	doexe ${THREED_PROGS}
+
+	cd "${S}"
+	dodoc 0-README
+	cd "${S}"/doc
+	dodoc CHANGES DESIGN TODO
+	docinto txt
+	dodoc Driver-programming-HOWTO add_driver svgalib.lsm \
+		README.{joystick,keymap,multi-monitor,patching,vesa}
+	# avoid installation of a broken symlink
+	newdoc ../lrmi-0.6m/README README.lrmi
+}
+
+pkg_postinst() {
+	! use build && use kernel-helper && linux-mod_pkg_postinst
+}
diff --git a/media-plugins/emotion_generic_players/Manifest b/media-plugins/emotion_generic_players/Manifest
index 1c2c4562f1be..192505ff944e 100644
--- a/media-plugins/emotion_generic_players/Manifest
+++ b/media-plugins/emotion_generic_players/Manifest
@@ -1,2 +1,3 @@
 DIST emotion_generic_players-1.15.0.tar.xz 100080 SHA256 9f6d5e9041ac7c014d663dac56d1b39ac42a45abe954d09d0edbf6e759e55f5f SHA512 e0dbebadf9fa3b8b6af4f6828e13a7445731508f219258d2c12c6c0a27e140571dc7abf657fe34fba4295a4c5f6a370950e29c9b3c5dad38ab746e20ccaa4ea3 WHIRLPOOL 1ad44ce27f975244420a4ccd376240d125a93f6894e785faf2ad6f620e35975dbba2d481273c81347dd5e1816c579c47a99d2291e5448964e949be9650bd077b
 DIST emotion_generic_players-1.16.0.tar.xz 100072 SHA256 d5cbfdb31678cd9f6cf70077afe03f07f9076cef7a9faa424da437c38cf06a98 SHA512 5c1d2d074549cec12746670c06ded87378870569ebaba7ccecaec66442a0760a8a08951f2b3e608449e2faae5a756d5148d51aa8fcd162cdb44566f1beb0f7d1 WHIRLPOOL 28bbcc17491b1bd201add975384fa03279bd196495ed59cbb7ebd441475ebbf49c17b5128cf836462b1d1f405a4aa769becde1c5c74d21f8c40fe69cb30dc427
+DIST emotion_generic_players-1.17.0.tar.xz 103208 SHA256 e7de008b4ceea3df0fc2e82248fbf96f645a6989858d0d8a2c0ccc5a12c56a0e SHA512 589fa088fc3dc8a0d2578eabca1b8560bec1352732991d1d0df5e1c7d471b6309f6e8b0ec9e9985ec556d77cf5cb1605df71d0192bf28f34780ac30d1919acdd WHIRLPOOL f59a9e2f49d7cea8fd647b6129be4a3b97aa9a4258672124afb0bbec31a53ebbcd6c047bf2d7d5ad3a9ffb71f1f8c2e1a68a588854ff826866dab88cf1c4ef54
diff --git a/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild b/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild
new file mode 100644
index 000000000000..f0a638866b7a
--- /dev/null
+++ b/media-plugins/emotion_generic_players/emotion_generic_players-1.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Provides external applications as generic loaders for Evas"
+HOMEPAGE="https://www.enlightenment.org/"
+
+LICENSE="GPL-2"
+# The -arch need to keyword vlc first.
+KEYWORDS="-alpha ~amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris"
+
+RDEPEND=">=dev-libs/efl-${PV}
+	media-video/vlc"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
diff --git a/media-plugins/evas_generic_loaders/Manifest b/media-plugins/evas_generic_loaders/Manifest
index 606bfed2ed1a..f663b3c87606 100644
--- a/media-plugins/evas_generic_loaders/Manifest
+++ b/media-plugins/evas_generic_loaders/Manifest
@@ -1,3 +1,4 @@
 DIST evas_generic_loaders-1.12.0.tar.bz2 215245 SHA256 981a6b70cfcc99c95936c835c9992735fcb004a99579e461ae64d2e28ea14f20 SHA512 9752fad43843c4fe2a86d8fcab00176f2dcb27888b84f57632add70a47daa4ab5775c0dcbd785e4a8b20b4ce09f4fd6f361128f166cd1f4753ac86afeb8443d5 WHIRLPOOL 4657ef9113d6e0255c26f65bceda87f29defccfbf7cdb803d722d9dbff1ff45721dd4287bc98dd79a06c3072756e062df9391bb5828657c950cbe0c3baf6a77c
 DIST evas_generic_loaders-1.15.0.tar.xz 186976 SHA256 1e539e4d4d4e1590345caeb7fdd84f47ec7cd63bb76b6b7107a87420a401fd7f SHA512 629f2d264b7904dbe4d057878c96ad78257bb73e1304ce441d7f14d4c1d5638793331e0b7bd376b9debe8761a62d96e5342ce642a7b1aa164aee595e327a6b08 WHIRLPOOL b5112d1833f274a90fc2087ece41e4c26057abbdc1ee7b2f73ce960ff4f533ea321e805f732538a4546a2a0305141d775ec0b4ea4f4040e0025bccaf63263611
 DIST evas_generic_loaders-1.16.0.tar.xz 186976 SHA256 d5799c212c36286b954c111bbd2d87950b0c96c5ad0ace8ebcad9918f38883c6 SHA512 37318399348c9944a36cb1809b072fa63cf2868dcb7b728daf1fd569fd5bd45cc65e6c948857784cb9a5ab1870bbddb6b30bd454c085febf46ca4fd58d3b5479 WHIRLPOOL 4caffeb22d6a44cbab81d011e84c7b447c62787759e20bf01c9cdd51f0d8dcb80cc189bf2ac7ec23b7fbc10308f0c904d3117d51b4ca1a8b4ae91148cef8ccd3
+DIST evas_generic_loaders-1.17.0.tar.xz 197860 SHA256 c2f5193a9326532d3ab3ff76f547b9d17b33ae7221ce4d6e0aefb905ba0dd87a SHA512 af1deb9f4b19d500b7633d252acf7a8cf94353b19a8944b8787d564a7b60ac1640d691b37e330edf3a0dce20be83c3199ec757cd38b8d59009e55cc31039c551 WHIRLPOOL 17436e1b54c180a556c25db10f805ccd9876f210fe7d75686774e84394cfb0fab4c09839356005d07c34ecadb651074f80e708474ced80c2c6545ff601cfeba8
diff --git a/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild
new file mode 100644
index 000000000000..91e5a0120525
--- /dev/null
+++ b/media-plugins/evas_generic_loaders/evas_generic_loaders-1.17.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Provides external applications as generic loaders for Evas"
+HOMEPAGE="https://www.enlightenment.org/"
+
+LICENSE="GPL-2"
+IUSE="gstreamer pdf postscript raw svg"
+
+RDEPEND=">=dev-libs/efl-${PV}
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	pdf? ( app-text/poppler )
+	postscript? ( app-text/libspectre )
+	raw? ( media-libs/libraw )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	E_ECONF=(
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable pdf poppler)
+		$(use_enable postscript spectre)
+		$(use_enable raw libraw)
+		$(use_enable svg)
+
+		--disable-gstreamer
+	)
+
+	enlightenment_src_configure
+}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
index 8fa3fd2dd98e..7895d1b32eff 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="daap +dvd flickr freebox gnome-online-accounts lua subtitles thetvdb tracker upnp-av +vimeo +youtube"
 
 # Bump gom requirement to avoid segfaults
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
index 6effc27dca19..b23a6da5460e 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
index 3ce5f6335a9b..e3cc0192ab55 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
 HOMEPAGE="http://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
index bd630f6a4c3f..bddd7da45f09 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for ASS/SSA rendering with effects support"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
index 27276ed75e2c..7f4037e6f9c1 100644
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Bluetooth plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
index d358742294d3..7c0e5e5bc428 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
index dfb90e346c3d..ba686f129497 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
index 4da3cddcefe9..e45d96cfc6f4 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
@@ -9,7 +9,7 @@ inherit gstreamer
 
 DESCRIPTION="MPEG-DASH plugin"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
index d55f6e5d7668..335282e50466 100644
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="DTLS plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
index d7a45be89a97..5e82c19683eb 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
index 3fb50bb26d97..3df701516526 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin to demux and decode DV"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
index b22796b01369..5f59dd94b659 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPION="GStreamer plugin to allow capture from dvb devices"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
index 33c1a6106f32..e93897a9c93e 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
index 5479e49bccc5..44aacdb852aa 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
index 8bd48ebf45f5..34b6a8625dcb 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
index 6d88455ee2a4..64abfb71c708 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE="gst-plugins-good"
 inherit gstreamer
 
 DESCRIPTION="GStreamer encoder/decoder/tagger for FLAC"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
index 9629ce40e830..c079e9ef0b3d 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="GdkPixbuf-based image decoder, overlay and sink"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
index bcffd235ebd2..c4f5b5814d8b 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="HTTP live streaming plugin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # FIXME: automagic fallback from nettle to libgcrypt to openssl
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
index 69984a99790b..168c37dae4f0 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="GStreamer source/sink to transfer audio data with JACK ports"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
index 0f5a9efc9da0..02355d8aeb72 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer encoder/decoder for JPEG format"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
index 94f2af2b6417..c0ff0c52e17b 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
index d2d35c4d4c24..6d4818b7607c 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libav +orc"
 
 # XXX: bzip2/lzma are automagic
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
index 4d9c5cdd8bd8..60d1cba392c2 100644
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.265 decoder plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
index da21a5918ecf..a6ba75a15b05 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
index dd13ddef484d..c5617e495905 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer encoder/decoder for PNG images"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
index 0607a8352af9..de9387ad20ef 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
index 4786a7a0c2bd..2ed0ea4b949e 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
index c8732196949a..2b01f6da901c 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
index 602582f875bb..8f4c6d5b3990 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
index 720eed63fa5c..69a870e3ae63 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer
 
 DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
index 2f8af815174a..f39726e7afb9 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
index 48deb78b2c7d..cd0f2dd808e4 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
index 4e9483af5669..aaaf64a743a5 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
index 7334a7290a27..f319c911335e 100644
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.3.ebuild b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.3.ebuild
index ce6c0d1bc944..c912e6713997 100644
--- a/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-openh264/gst-plugins-openh264-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.264 encoder/decoder plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
index 06a5fc4fc2da..a104a5815b11 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for Opus audio codec support"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 COMMON_DEPEND=">=media-libs/opus-1.0.2-r2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
index 027fc65e5e3b..09e003e742a4 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
index 7f8a389bfc62..bb54b1b20ab2 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
index 9cbac1d668c2..655cfd3269e0 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.3.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.3.ebuild
index e746624cea3e..84ce5fe23a4c 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin to capture firewire video"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
index fe73f0c7f619..72df8c715fc9 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.3.ebuild b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.3.ebuild
index 8ef6dc6308e1..7068b19b24ec 100644
--- a/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for supporting RTMP sources"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.3.ebuild b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.3.ebuild
index 6e3ed9a2cc5d..8e5f4aa300b7 100644
--- a/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-schroedinger/gst-plugins-schroedinger-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 
 inherit gstreamer
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.3.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.3.ebuild
index 94a37f1b37d0..f3c2303d9ea6 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin to send data to an icecast server"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.3.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.3.ebuild
index ac688b575bf0..5259095e9ccf 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.3.ebuild b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.3.ebuild
index 83b89c561a12..d854455d9c0a 100644
--- a/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="Smooth Streaming plugin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.3.ebuild b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.3.ebuild
index df0a6b754f1d..e537ca5124c4 100644
--- a/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-soundtouch/gst-plugins-soundtouch-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer elements for beats-per-minute detection and pitch controlling"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libsoundtouch-1.7.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-0.10.31-r2.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-0.10.31-r2.ebuild
index 3d22296caf90..dd8a27b4f0eb 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-0.10.31-r2.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-0.10.31-r2.ebuild
@@ -9,7 +9,7 @@ inherit autotools eutils gstreamer
 
 DESCRIPTION="GStreamer plugin for HTTP client sources"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 RDEPEND=">=net-libs/libsoup-2.44.2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
index ae54c13c034c..32084b86f1f9 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for HTTP client source/sink"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 # Depend on >=net-libs/libsoup-2.47.0 once it is stable (see LIBSOUP_DOES_NOT_STEAL_OUR_CONTEXT in ext/soup)
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.3.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.3.ebuild
index 5308adb61f34..90b3fa541ba4 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin to allow encoding and decoding of speex"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
index 6214058b962a..84340c000ce0 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer taglib based tag handler"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.3.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.3.ebuild
index a64875fb7571..cfc43e10d3ee 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.6.3.ebuild b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.6.3.ebuild
index a085804ca223..a426951984fe 100644
--- a/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="UVC compliant H264 encoding cameras plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
index 3e3ec774d68a..377966340b5a 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPION="plugin to allow capture from video4linux2 devices"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
index c2d0d53f2f8b..e318f528dada 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+drm opengl wayland +X"
 REQUIRED_USE="|| ( drm opengl wayland X )"
 
diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.3.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.3.ebuild
index e443778561ab..d9bc93eb87c0 100644
--- a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for encoding AAC"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.3.ebuild b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.3.ebuild
index d7b75bcb738c..cb25235f52ec 100644
--- a/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-voamrwbenc/gst-plugins-voamrwbenc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for encoding AMR-WB"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
index 7f4c591e8b9c..1a35afa88a88 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer decoder for vpx video format"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 # VP9 is under experimental, do not enable it now
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
index 241f9b48ca83..c67c7aa77f5f 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer encoder/decoder for wavpack audio format"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
index 8fa2ffe0ee68..51e5e623003f 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 
 inherit gstreamer
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 # 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.3.ebuild b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.3.ebuild
index 1d8202fe5624..89821d743fa6 100644
--- a/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-x265/gst-plugins-x265-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="H.265 encoder plugin for GStreamer."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
index 810762692891..77d6809a25ab 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.3.ebuild
index 83eb9214db39..f19fe5438203 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer
 
 DESCRIPTION="GStreamer plugin for X11 video capture stream"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild
similarity index 97%
rename from media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
rename to media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild
index ac217b1644de..e6acfe47c29b 100644
--- a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -70,7 +70,7 @@ DEPEND="!media-plugins/mytharchive
 	mythweather? (
 		dev-perl/DateManip
 		dev-perl/DateTime-Format-ISO8601
-		dev-perl/ImageSize
+		dev-perl/Image-Size
 		dev-perl/JSON
 		dev-perl/SOAP-Lite
 		dev-perl/XML-Simple
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.ebuild
similarity index 98%
rename from media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
rename to media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.ebuild
index 740b4872f5a3..8d1ce4201db1 100644
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r1.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.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$
 
@@ -111,7 +111,7 @@ DEPEND="!media-plugins/mytharchive
 		dev-perl/DateManip
 		dev-perl/DateTime-Format-ISO8601
 		>=dev-perl/DateTime-1
-		dev-perl/ImageSize
+		dev-perl/Image-Size
 		dev-perl/JSON
 		dev-perl/SOAP-Lite
 		dev-perl/XML-Simple
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r4.ebuild
similarity index 99%
rename from media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
rename to media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r4.ebuild
index 8305e574ea3f..a82d7ebb25ae 100644
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r2.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r4.ebuild
@@ -111,7 +111,7 @@ DEPEND="!media-plugins/mytharchive
 		dev-perl/DateManip
 		dev-perl/DateTime-Format-ISO8601
 		>=dev-perl/DateTime-1
-		dev-perl/ImageSize
+		dev-perl/Image-Size
 		dev-perl/JSON
 		dev-perl/SOAP-Lite
 		dev-perl/XML-Simple
diff --git a/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild b/media-plugins/mythplugins/mythplugins-0.27_p20140321-r1.ebuild
similarity index 97%
rename from media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
rename to media-plugins/mythplugins/mythplugins-0.27_p20140321-r1.ebuild
index d0311739a21a..f888c76cafde 100644
--- a/media-plugins/mythplugins/mythplugins-0.27_p20140321.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27_p20140321-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$
 
@@ -71,7 +71,7 @@ DEPEND="!media-plugins/mytharchive
 		dev-perl/DateManip
 		dev-perl/DateTime-Format-ISO8601
 		>=dev-perl/DateTime-1
-		dev-perl/ImageSize
+		dev-perl/Image-Size
 		dev-perl/JSON
 		dev-perl/SOAP-Lite
 		dev-perl/XML-Simple
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index ceb6b7e829b8..a31aa3d1f213 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -9,3 +9,4 @@ DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43edda
 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
 DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
 DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f6628848258051869095588a50940f49f6b SHA512 8fdda5f6efde18a66d89605f0a4d14756ce573ffc5de54e7229c7aa76ab11cbba33bdb775fb5c5dde86f4d308c2a96b904a0298d7b9c598300ab35e835f2ea0a WHIRLPOOL 0f4e054cdb2a1022f860354d70e4517bebee66e0711f16b4e3b19ebc8f354e364fd1a91e64aa3f7c692f3251ee261cdc2fda29215cef58c9a8cebcc20708af72
+DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
diff --git a/media-sound/ardour/ardour-4.7.ebuild b/media-sound/ardour/ardour-4.7.ebuild
new file mode 100644
index 000000000000..6ef94c0916bc
--- /dev/null
+++ b/media-sound/ardour/ardour-4.7.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
+	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+}
diff --git a/media-sound/banshee/banshee-2.6.2.ebuild b/media-sound/banshee/banshee-2.6.2.ebuild
index c56ae35549c2..c830b9908f6e 100644
--- a/media-sound/banshee/banshee-2.6.2.ebuild
+++ b/media-sound/banshee/banshee-2.6.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://banshee.fm/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+aac +cdda +bpm daap doc +encode ipod karma mtp test udev +web youtube"
 
 RDEPEND="
diff --git a/media-sound/gnome-music/gnome-music-3.18.2.ebuild b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
index 601462fb00a3..5f321560acd7 100644
--- a/media-sound/gnome-music/gnome-music-3.18.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
index 45af29fc7813..7d0295b7603f 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 # For the list of plugins, see src/audioProfile.js
diff --git a/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
new file mode 100644
index 000000000000..9ade09033976
--- /dev/null
+++ b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
@@ -0,0 +1,20 @@
+Patch for building with latest FFmpeg 3.0
+https://bugs.gentoo.org/show_bug.cgi?id=575328
+
+Inspired by
+https://raw.githubusercontent.com/Homebrew/patches/1282e60/moc/moc-2.5.0.diff
+
+We can unconditionally depend on the existence of 'channel_layout.h',
+as even the oldest version in the Gentoo tree contains this header.
+
+--- moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -66,7 +66,7 @@
+ GCC_DIAG_ON(deprecated-declarations)
+ #include <libavutil/mathematics.h>
+ #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ #endif
+ 
+ /* FFmpeg also likes common names, without that, our common.h and log.h
diff --git a/media-sound/moc/moc-2.6_alpha1-r1.ebuild b/media-sound/moc/moc-2.6_alpha1-r1.ebuild
index a5b24cdb1e7a..3901a156b09d 100644
--- a/media-sound/moc/moc-2.6_alpha1-r1.ebuild
+++ b/media-sound/moc/moc-2.6_alpha1-r1.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-ncurses-underlinking.patch"
+	"${FILESDIR}/${P}-audioconvert.h.patch"
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/media-sound/pulseaudio/pulseaudio-8.0.ebuild b/media-sound/pulseaudio/pulseaudio-8.0.ebuild
index ef090e542b40..ba399b312c9a 100644
--- a/media-sound/pulseaudio/pulseaudio-8.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/rhythmbox/rhythmbox-3.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.3.ebuild
index 75852d9cf8e5..8bda694a5356 100644
--- a/media-sound/rhythmbox/rhythmbox-3.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.3.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 "
 #	webkit? ( python )
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Tests failing for years without upstream caring at all
 # upstream bug #688745
diff --git a/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
index 4ef2e3b3d353..d0ca56598b58 100644
--- a/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="flac test vorbis"
 
 COMMON_DEPEND="
diff --git a/media-sound/soundconverter/soundconverter-2.1.6.ebuild b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
index 29534f12676b..230ed9acf179 100644
--- a/media-sound/soundconverter/soundconverter-2.1.6.ebuild
+++ b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="aac flac mp3 opus vorbis"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-tv/xawtv/ChangeLog-2015 b/media-tv/xawtv/ChangeLog-2015
deleted file mode 100644
index d9342111a74b..000000000000
--- a/media-tv/xawtv/ChangeLog-2015
+++ /dev/null
@@ -1,444 +0,0 @@
-# ChangeLog for media-tv/xawtv
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.73 2015/05/02 15:51:10 dilfridge Exp $
-
-  02 May 2015; Andreas K. Huettel <dilfridge@gentoo.org> xawtv-3.95-r3.ebuild:
-  Fix libpng and jpeg slots
-
-*xawtv-3.95-r3 (02 May 2015)
-
-  02 May 2015; Andreas K. Huettel <dilfridge@gentoo.org> +xawtv-3.95-r3.ebuild:
-  Port to EAPI=5
-
-  29 Jan 2015; Michał Górny <mgorny@gentoo.org> xawtv-3.95-r2.ebuild:
-  Convert to CPU_FLAGS_X86.
-
-  06 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> xawtv-3.95-r2.ebuild,
-  files/xawtv-3.95-jpeg-7.patch:
-  Install Xawtv app-defaults to correct directory at /usr/share/X11. Fix
-  building with libjpeg.so.62 API wrt #479848 by Martin von Gagern
-
-  31 May 2013; Jeroen Roovers <jer@gentoo.org>
-  files/xawtv-3.95-pagemask-fix.patch:
-  Fix relative paths in patch (bug #471818 by Aaron Pelton).
-
-  24 Oct 2012; Ulrich Müller <ulm@gentoo.org> xawtv-3.95-r2.ebuild:
-  Update dependency after package move from x11-libs/openmotif to
-  x11-libs/motif.
-
-  15 Mar 2011; Ulrich Mueller <ulm@gentoo.org> xawtv-3.95-r2.ebuild:
-  Replace dependency on virtual/quicktime by libquicktime, bug 358857.
-
-  26 Feb 2011; Kevin McCarthy <signals@gentoo.org> xawtv-3.95-r2.ebuild:
-  Updated depends from media-libs/jpeg to virtual/jpeg
-
-  10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> xawtv-3.95-r2.ebuild:
-  Fix openmotif dependency. Change EAPI to 1.
-
-  19 Mar 2010; Raúl Porcel <armin76@gentoo.org> xawtv-3.95-r2.ebuild:
-  alpha/ia64 stable wrt #307891
-
-  18 Mar 2010; Markos Chandras <hwoarang@gentoo.org> xawtv-3.95-r2.ebuild:
-  Stable on amd64 wrt bug #307891
-
-  12 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> xawtv-3.95-r2.ebuild:
-  x86 stable wrt bug #307891
-
-  05 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org> xawtv-3.95-r1.ebuild,
-  xawtv-3.95-r2.ebuild:
-  Drop removed eclass function call.
-
-*xawtv-3.95-r2 (02 Mar 2010)
-
-  02 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +xawtv-3.95-r2.ebuild,
-  +files/xawtv-3.95-jpeg-7.patch:
-  Fix segmentation fault with jpeg >= 7 wrt #288158 by Salah Coronya.
-
-  10 Jan 2009; Steve Dibb <beandog@gentoo.org> xawtv-3.95-r1.ebuild:
-  Drop deprecated bindnow flags, bug 226979
-
-  27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> xawtv-3.95-r1.ebuild:
-  Fixed quoting.
-
-  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xawtv-3.95-r1.ebuild:
-  Drop virtual/x11 references.
-
-  02 Mar 2007; Alexis Ballier <aballier@gentoo.org>
-  +files/xawtv-3.95-pagemask-fix.patch, xawtv-3.95-r1.ebuild:
-  Fix compilation with linux-headers-2.6.20, patch from Andreas Jochens,
-  thanks to Nicolas Boichat <nicolas@boichat.ch> for reporting that in bug
-  #168527
-
-  31 Dec 2006; Steve Dibb <beandog@gentoo.org> xawtv-3.95-r1.ebuild:
-  Fix libpng dep, bug 150826
-
-  23 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
-  -files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch,
-  -files/xawtv-3.94-no-x11.patch, -xawtv-3.94-r1.ebuild:
-  Remove version 3.94, and close bug #138606.
-
-  14 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> xawtv-3.95-r1.ebuild:
-  Stable on Alpha.
-
-  11 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> xawtv-3.95-r1.ebuild:
-  Added depend to latest automake/autoconf, thanks to Andy
-  <andyreif@studcs.uni-sb.de>, Bug #154690.
-
-  17 Oct 2006; Alexis Ballier <aballier@gentoo.org>
-  +files/xawtv-3.95-libquicktime-compat.patch, xawtv-3.95-r1.ebuild:
-  Adding a patch to compile against >=media-libs/libquicktime-0.9.9, bug #141429
-
-  14 Oct 2006; Aron Griffis <agriffis@gentoo.org> xawtv-3.95-r1.ebuild:
-  Mark 3.95-r1 stable on ia64. #138606
-
-  06 Oct 2006; Steve Dibb <beandog@gentoo.org> xawtv-3.94-r1.ebuild,
-  xawtv-3.95-r1.ebuild:
-  Update description, wrt bug 150319
-
-  01 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Remove build-time dependency on xproto and/or xextproto.
-
-  16 Aug 2006; Joshua Jackson <tsunam@gentoo.org> xawtv-3.95-r1.ebuild:
-  Stable x86; for bug #138606
-
-  06 Aug 2006; Simon Stelling <blubb@gentoo.org> xawtv-3.95-r1.ebuild:
-  stable on amd64
-
-  28 Jul 2006; Joshua Jackson <tsunam@gentoo.org> ChangeLog:
-  Stable x86; bug #138606
-
-  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Remove spurious dependencies extracted erroneously by the dependency scripts.
-
-  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Fix building by appending an -I parameter when building with X enabled.
-
-  07 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Depend on series 6 of virtual/x11 so to not screw up stable users with
-  modular setup.
-
-  03 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Add missing xset and bdftopcf dependencies as per bug #138783.
-
-  30 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> -xawtv-3.95.ebuild:
-  Remove version.
-
-  11 Jun 2006; Robin H. Johnson <robbat2@gentoo.org> xawtv-3.95-r1.ebuild:
-  Bug #131673 - missing dep on xset with modular X.
-
-  30 Apr 2006; Simon Stelling <blubb@gentoo.org> xawtv-3.94-r1.ebuild:
-  stable on amd64
-
-  19 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Bump patchset to respect LDFLAGS.
-
-  18 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Add patch to build with GCC 4.1, thanks to Matteo Azzali and Mark Loeser in
-  bug #126593.
-
-  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Update patchlevel, adding a patch to avoid binaries to be stripped during
-  install phase, leave to portage to handle that.
-
-  15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95.ebuild,
-  xawtv-3.95-r1.ebuild:
-  Fix wrong xinerama useflag (should have been xext). Bug #122886.
-
-  12 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> xawtv-3.95-r1.ebuild:
-  Force non-parallel make on fonts generation, bug #121821.
-
-  05 Feb 2006; Michael Hanselmann <hansmi@gentoo.org> xawtv-3.95-r1.ebuild:
-  Install xawtv-remote.1 manpage, too.
-
-*xawtv-3.95-r1 (05 Feb 2006)
-
-  04 Feb 2006; Michael Hanselmann <hansmi@gentoo.org> +xawtv-3.95-r1.ebuild:
-  Install v4lctl also when the X USE flag is disabled.
-
-  04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
-  -files/tv-fonts-1.0-gentoo.diff, -files/tv-fonts-1.1-nox.patch,
-  -files/xawtv-3.94-gcc4.patch, -files/xawtv-3.95-autocolor.patch,
-  -files/xawtv-3.95-bindnow.patch, -files/xawtv-3.95-sparc.patch,
-  -files/alevtd-style-mozilla.diff, -xawtv-3.86-r2.ebuild,
-  -xawtv-3.94-r2.ebuild, xawtv-3.95.ebuild:
-  Move patches in a separate patchset out of ${FILESDIR}.
-
-*xawtv-3.95 (13 Jan 2006)
-
-  13 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
-  +files/tv-fonts-1.1-nox.patch, +files/xawtv-3.95-autocolor.patch,
-  +files/xawtv-3.95-bindnow.patch, +files/xawtv-3.95-sparc.patch,
-  +xawtv-3.95.ebuild:
-  Version bump to version 3.95; modular x dependencies; added patch for SPARC
-  alignment; added xext useflag to disable some extensions like xinerama and
-  others; fixes bugs #118802, #115836, #112429, #96848, #94933, #81987.
-
-  09 Oct 2005; Matthias Schwarzott <zzam@gentoo.org>
-  +files/xawtv-3.94-no-x11.patch, xawtv-3.94-r2.ebuild:
-  Enable compilation with USE=-X. See Bug #98797.
-
-  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> xawtv-3.94-r1.ebuild:
-  Mark 3.94-r1 stable on alpha
-
-  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xawtv-3.94-r1.ebuild:
-  stable on ia64
-
-  16 Aug 2005; Doug Goldstein <cardoe@gentoo.org> xawtv-3.94-r2.ebuild:
-  fixed typo
-
-  30 May 2005; Doug Goldstein <cardoe@gentoo.org> xawtv-3.94-r2.ebuild:
-  fix TV fonts build
-
-  30 May 2005; Doug Goldstein <cardoe@gentoo.org> xawtv-3.94-r1.ebuild:
-  stable for bug #81564
-
-  30 May 2005; Doug Goldstein <cardoe@gentoo.org> xawtv-3.94-r2.ebuild:
-  gcc4 fixes from  Flameeyes
-
-*xawtv-3.94-r2 (30 May 2005)
-
-  30 May 2005; Doug Goldstein <cardoe@gentoo.org> -xawtv-3.94.ebuild,
-  +xawtv-3.94-r2.ebuild:
-  Fixes bug #88105, compat with bug #88102, bug #72141, bug #38444, bug
-  #40063, bug #80895, bug #88103, bug #75271 Other fixes and clean ups as well
-  Many much credit to Octavio Ruiz (tacvbo@tacvbo.net) for most of the work
-
-  09 Apr 2005; Simon Stelling <blubb@gentoo.org> xawtv-3.94-r1.ebuild:
-  fixed #88102
-
-  21 Feb 2005; Simon Stelling <blubb@gentoo.org> :
-  added ~amd64
-
-*xawtv-3.94-r1 (25 Jan 2005)
-
-  25 Jan 2005; Doug Goldstein <cardoe@gentoo.org>
-  +files/xawtv-3.94-allow-xlibs-in-normal-search-path.patch,
-  -xawtv-3.86-r1.ebuild, -xawtv-3.88.1.ebuild, -xawtv-3.90-r1.ebuild,
-  -xawtv-3.91-r1.ebuild, -xawtv-3.93.ebuild, +xawtv-3.94-r1.ebuild:
-  compile fixes to support the latest xorg-x11 ebuilds, bug #75251
-
-*xawtv-3.86-r2 (29 Aug 2004)
-
-  29 Aug 2004; Martin Holzer <mholzer@gentoo.org> xawtv-3.86-r2.ebuild,
-  files/alevtd-style-mozilla.diff:
-  adding patch for style sheet correction. patch submitted by Rudi Lippert
-  <gentoo@lyrikpage.de> In 48955
-
-*xawtv-3.94 (29 Aug 2004)
-
-  29 Aug 2004; Martin Holzer <mholzer@gentoo.org> xawtv-3.94.ebuild:
-  Version bumped. Closes 61083
-
-*xawtv-3.93 (28 Jul 2004)
-
-  28 Jul 2004; Daniel Goller <morfic@gentoo.org>  xawtv-3.93.ebuild:
-  Version bump, fixes gcc3.4 issues, effectivly closing bugs #52384 and #58002
-  Thanks penguinbox@coqui.net and alpeterson@wsu.edu
-
-*xawtv-3.92 (18 Jul 2004)
-
-  18 Jul 2004; Martin Holzer <mholzer@gentoo.org> xawtv-3.92.ebuild:
-  Version bumped.
-
-  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> xawtv-3.86-r1.ebuild,
-  xawtv-3.88.1.ebuild, xawtv-3.88.ebuild, xawtv-3.90-r1.ebuild,
-  xawtv-3.90.ebuild, xawtv-3.91-r1.ebuild, xawtv-3.91.ebuild:
-  Fix use invocation
-
-*xawtv-3.91-r1 (04 Jun 2004)
-
-  04 Jun 2004; Martin Holzer <mholzer@gentoo.org> xawtv-3.91-r1.ebuild:
-  changing default httproot.
-
-  15 Mar 2004; Stephen P. Becker <geoman@gentoo.org> xawtv-3.90-r1.ebuild,
-  xawtv-3.90.ebuild, xawtv-3.91.ebuild:
-  removed ~mips keywords...please do not keyword these for mips anymore
-
-*xawtv-3.91 (23 Feb 2004)
-
-  23 Feb 2004; Martin Holzer <mholzer@gentoo.org> xawtv-3.91.ebuild:
-  Version bumped. Closes 40767
-
-  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> xawtv-3.86-r1.ebuild,
-  xawtv-3.88.1.ebuild, xawtv-3.88.ebuild, xawtv-3.90-r1.ebuild,
-  xawtv-3.90.ebuild:
-  fixed motif dep
-
-*xawtv-3.90-r1 (04 Dec 2003)
-
-  04 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; xawtv-3.90-r1.ebuild:
-  Changing media-libs/zvbi dependency to USE flag to close bug #26723.
-
-  26 Oct 2003; Brad House <brad_mssw@gentoo.org> xawtv-3.90.ebuild:
-  take out use_enable mmx for amd64 as it assumes 32bit assembly which is
-  obviously incorrect
-
-*xawtv-3.90 (21 Oct 2003)
-
-  21 Oct 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.90.ebuild:
-  Version bump
-
-*xawtv-3.88.1 (21 Oct 2003)
-
-  21 Oct 2003; Martin Holzer <mholzer@gentoo.org> xawtv-3.88.1.ebuild:
-  Version bumped.
-
-  21 Jul 2003; John Mylchreest <johnm@gentoo.org>; xawtv-3.86-r1.ebuild,
-  xawtv-3.88.ebuild:
-  changing quicktime depend to virtual. fixes #24939
-
-  27 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86-r1.ebuild:
-  issue with remote display -- fix by CJ Kucera <gentoo@apocalyptech.com> in bug
-  #18999
-
-*xawtv-3.88 (18 Jun 2003)
-
-  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86-r1.ebuild,
-  xawtv-3.88.ebuild, files/tv-fonts-1.0-gentoo.diff, files/webcamrc:
-  moved to media-tv
-
-*xawtv-3.88 (18 Apr 2003)
-
-  18 Apr 2003; Daniel Robbins <drobbins@gentoo.org> A new upstream version
-  of xawtv.
-
-*xawtv-3.86-r1 (06 Apr 2003)
-
-  07 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86-r1.ebuild:
-  using virtualx eclass, because the fonts now want to run sometihng in X --
-  thanks to rommel in #gentoo for finding this
-
-  06 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86-r1.ebuild:
-  TV fonts are installed this time. Thanks to: Paul Kronenwetter
-  <kronenpj@netzero.net> for catching it and reporting to bug #18822
-
-*xawtv-3.86 (21 Mar 2003)
-
-  01 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.83.ebuild,
-  xawtv-3.85.ebuild, xawtv-3.86.ebuild:
-  removed xpm from DEPEND -- xfree86 provides it
-
-  27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86.ebuild:
-  mark stable on x86
-
-  21 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86.ebuild:
-  version bump
-
-*xawtv-3.85 (09 Mar 2003)
-
-  13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.83.ebuild,
-  xawtv-3.85.ebuild:
-  Added quicktime to IUSE. Thanks to: Matt Taylor <liverbugg@juno.com> in bug
-  #17409
-
-  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.85.ebuild:
-  plugins directory fixed. thanks to Patrick Kursawe <phosphan@gentoo.org> in
-  bug #17195
-
-  09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.85.ebuild:
-  version bump, thanks to: Chayim I. Kirshen <ckirshen@gnupower.net> in bug
-  #17037; also, webcam stuff is only installed if /home/httpd exists, otherwise
-  not: closes bug #16875 by David Bryson <mutex@kerneli.org>
-
-*xawtv-3.83 (02 Feb 2003)
-
-  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
-
-  Added media-libs/xpm to DEPEND, closing bug #15300 by Susie Edgeworth
-  <arienadean@yahoo.com>
-
-  02 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.83.ebuild
-  files/digest-xawtv-3.83 :
-
-  Version bump to newest bugfix release
-
-*xawtv-3.82 (06 Jan 2003)
-
-  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.82.ebuild
-  files/digest-xawtv-3.82 :
-
-  Version bump to newest upstream.
-
-*xawtv-3.81 (12 Dec 2002)
-
-  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
-
-  changed to DEPEND on virtual/motif.
-
-  15 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.81.ebuild :
-
-  Added app-text/recode for the MoTV portion of this (which is compiled only
-  if "motif" in USE).  Closes bug #12214 by rajiv@gentoo.org (Rajiv Manglani)
-
-  15 Dec 2002; Rajiv Manglani <rajiv@gentoo.org> xawtv-3.81.ebuild :
-  added ~ppc keyword.
-
-  15 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.80.ebuild
-  xawtv-3.81.ebuild :
-
-  Sed out #define MMX for non-MMX enabled architectures (USE based).  Thanks
-  to rajiv@gentoo.org (Rajiv Manglani) in bug #12179.
-
-  12 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.81.ebuild
-  files/digest-xawtv-3.81 :
-
-  Version bump, same bug report. Font problems really shouldn't exist...
-
-*xawtv-3.80 (12 Dec 2002)
-
-  12 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.80.ebuild
-  files/digest-xawtv-3.80 :
-
-  Version bump, thanks to: jordanmeek@yahoo.com (Jordan Meek) in bug #11143.
-  Also, this solves the issue with 3.78, where the fonts would screw up X
-  completely, closing bug #10238 by googleplex@wi.rr.com (Dave Berenson)
-
-  Later, same day: some small fixes for fonts again.
-
-*xawtv-3.78 (04 Nov 2002)
-
-  04 Nov 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.78.ebuild
-  files/tv-fonts-1.0-gentoo.diff files/digest-xawtv-3.78 files/webcamrc :
-
-  Version bump.  This release depends on libquicktime instead and the fonts
-  package is downloaded separately.  Thanks to: jmarcet@pobox.com (Javier
-  Marcet) in bug #7345 for informing us.  Also provided a default webcamrc
-  in the docs directory.  Thanks to: sascha@killerhippy.de (Sascha
-  Wuestemann) in bug #9895 for that.  Thanks to kev@kvance.com (Kev Vance)
-  in bug #7651 for the libquicktime heads up.
-
-*xawtv-3.73-r1 (14 July 2002)
-
-  14 July 2002; Brandon Low <lostlogic@gentoo.org> xawtv-3.73-r1.ebuild:
-
-  Add lirc support thanks goes to George Sauthoff, he did great work 
-  preparing the lirc ebuild.
-        
-*xawtv-3.73 (23 April 2002)
-
-  23 April 2002; Bart Verwilst <verwilst@gentoo.org> xawtv-3.73.ebuild:
-        
-  New version, removed old versions from the Portage tree
-
-*xawtv-3.65-r1 (30 Mar 2002)
-  11 Apr 2002; Spider <spider@gentoo.org> xawtv-3.65-r2.ebuild :
-  Changed the libpng dependency 
-
-*xawtv-3.65-r1 (30 Mar 2002)
-
-  30 Mar 2002; Aron Griffis <agriffis@gentoo.org> xawtv-3.65-r1.ebuild :
-
-  Added "use alsa" and corrected installation of fonts.  Now the font
-  installation doesn't violate the sandbox, and mkfontdir is properly run
-  after merge/unmerge.
-
-*xawtv-3.65 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that
-  the comments should well explained and written in clean English. The
-  details about writing correct changelogs are explained in the
-  skel.ChangeLog file which you can find in the root directory of the
-  portage repository.
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
deleted file mode 100644
index c8b6365a9664..000000000000
--- a/media-tv/xawtv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tv-fonts-1.1.tar.bz2 80177 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6 SHA512 669e3c13ede19f62d69d099a57ca39fd3326608b5b794221d29b3abcc29b1098fd30e0dcde1d1420c9aec55f6ae16d0a262b606ab598f5b3ee522f8b5540c3e9 WHIRLPOOL 3503a868d558151657ddfbd2fba5768ef6377a08a9c16eb5e0bb4d6c0862c4af66fc36271a13093a5b5558980d46f3e83baaa034c763febd6b17199deaac5532
-DIST xawtv-3.95.tar.gz 555731 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f SHA512 9c793ee7fa233aafb12decbd9289f09cbad5aa828db1f4dd89a9999e71bebe5faacc4c361cd41cf928931f32310bdb0c24e52c2c7c8d5595c286c163727faa01 WHIRLPOOL a55089b733d34fa144e9e56f6ff856c3401206294d42d348a05b1128421884269cfb890d16718ac3f3cd70159d7d683b4b9375f92fa936ebeeb22b84d9fd1257
-DIST xawtv-patches-4.tar.bz2 3258 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e SHA512 4f7bf2ac7be1d487daaccaaf853e3ed6a388784d15e87413cbefa4fb2e04c324f5cdce498636d4bf83d70a698b343df877e1f3df9acd615932f361b4292f6dd5 WHIRLPOOL 8b8b72e7815c04470f430e2ba3c1e252782813af56cb9875b647b70e5379f2ce13d1fb5667a6274e472e6dbe1402069b20c36933e24312ab96fef4eb1847f09a
diff --git a/media-tv/xawtv/files/webcamrc b/media-tv/xawtv/files/webcamrc
deleted file mode 100644
index 6773a673cb4c..000000000000
--- a/media-tv/xawtv/files/webcamrc
+++ /dev/null
@@ -1,30 +0,0 @@
-       [ftp]
-       host = www
-       user = webcam
-       pass = xxxxxx
-       dir  = public_html/images
-       file = webcam.jpeg
-       tmp  = uploading.jpeg
-       passive = 1
-       debug = 0
-       auto = 0
-       local = 0
-       ssh = 0
-
-       [grab]
-       device = /dev/video0
-       text = "webcam %Y-%m-%d %H:%M:%S"
-       infofile = filename
-       width = 320
-       height = 240
-       delay = 3
-       input = composite1
-       norm = pal
-       rotate = 0
-       top = 0
-       left = 0
-       bottom = -1
-       right = -1
-       quality = 75
-       trigger = 0
-       once = 0
diff --git a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch b/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
deleted file mode 100644
index 20219853d526..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-jpeg-7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/288158
-http://bugs.gentoo.org/479848
-
---- libng/plugins/conv-mjpeg.c
-+++ libng/plugins/conv-mjpeg.c
-@@ -229,6 +229,9 @@
-     jpeg_set_quality(&h->mjpg_cinfo, ng_jpeg_quality, TRUE);
- 
-     h->mjpg_cinfo.raw_data_in = TRUE;
-+    #if JPEG_LIB_VERSION >= 70
-+    h->mjpg_cinfo.do_fancy_downsampling = FALSE;
-+    #endif
-     jpeg_set_colorspace(&h->mjpg_cinfo,JCS_YCbCr);
- 
-     h->mjpg_ptrs[0] = malloc(h->fmt.height*sizeof(char*));
-@@ -453,6 +456,9 @@
-     h->buf = in;
-     jpeg_read_header(&h->mjpg_cinfo,1);
-     h->mjpg_cinfo.raw_data_out = 1;
-+    #if JPEG_LIB_VERSION >= 70
-+    h->mjpg_cinfo.do_fancy_upsampling = FALSE;
-+    #endif
- 
-     if (ng_debug > 1)
- 	fprintf(stderr,"yuv: %dx%d  -  %d %d / %d %d / %d %d\n",
diff --git a/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch b/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch
deleted file mode 100644
index a86c48d83b4e..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-libquicktime-compat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- xawtv-3.95/libng/plugins/write-qt.c.old	2006-10-16 20:50:45.000000000 +0200
-+++ xawtv-3.95/libng/plugins/write-qt.c	2006-10-17 19:36:09.000000000 +0200
-@@ -348,10 +348,10 @@
- 		    info[i]->name,info[i]->long_name);
- 	    for (j = 0; j < info[i]->num_fourccs; j++)
- 		fprintf(stderr,"   fcc   : %s\n",info[i]->fourccs[j]);
--	    for (j = 0; j < info[i]->num_encoding_colormodels; j++)
-+	    for (j = 0; j < lqt_num_colormodels(); j++)
- 		fprintf(stderr,"   cmodel: %d [%s]\n",
--			info[i]->encoding_colormodels[j],
--			lqt_get_colormodel_string(info[i]->encoding_colormodels[j]));
-+			lqt_get_colormodel(j),
-+			lqt_get_colormodel_string(j));
- 	}
- 
- 	/* sanity checks */
-@@ -378,8 +378,8 @@
- 	/* pick colormodel */
- 	fmtid  = VIDEO_NONE;
- 	cmodel = 0;
--	for (j = 0; j < info[i]->num_encoding_colormodels; j++) {
--	    cmodel = info[i]->encoding_colormodels[j];
-+	for (j = 0; j < lqt_num_colormodels(); j++) {
-+	    cmodel = lqt_get_colormodel(j);
- 	    if (cmodel>= sizeof(cmodels)/sizeof(int))
- 		continue;
- 	    if (!cmodels[cmodel])
diff --git a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
deleted file mode 100644
index 7a1ff5e71f02..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch from Andreas Jochens
-http://lists.debian.org/debian-qa-packages/2006/08/msg00519.html
-
---- a/console/fbtools.c	2003-02-14 14:14:04.000000000 +0000
-+++ b/console/fbtools.c	2006-08-23 10:57:40.000000000 +0000
-@@ -21,8 +21,6 @@
- #include <linux/vt.h>
- #include <linux/fb.h>
- 
--#include <asm/page.h>
--
- #include "fbtools.h"
- 
- /* -------------------------------------------------------------------- */
-@@ -424,7 +422,7 @@
- 	goto err;
-     }
- #endif
--    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK);
-+    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1);
-     fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
- 		  PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
-     if (-1L == (long)fb_mem) {
---- a/console/matrox.c	2005-02-03 10:40:41.000000000 +0000
-+++ b/console/matrox.c	2006-08-23 11:09:51.000000000 +0000
-@@ -9,7 +9,6 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- 
--#include <asm/page.h> /* PAGE_SIZE */
- #include <linux/fb.h>
- 
- #include "byteswap.h"
-@@ -226,7 +225,7 @@
- 	return -1;
-     }
-     off = (unsigned long)fb_fix.mmio_start -
--	((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1));
-+	((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1));
-     bmmio += off;
-     mmio = (uint32_t*)bmmio;
-     return 0;
diff --git a/media-tv/xawtv/files/xawtv-3.95-stdbool.patch b/media-tv/xawtv/files/xawtv-3.95-stdbool.patch
deleted file mode 100644
index b93bb11c8644..000000000000
--- a/media-tv/xawtv/files/xawtv-3.95-stdbool.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- x11/blit.c
-+++ x11/blit.c
-@@ -13,6 +13,7 @@
- #include <pthread.h>
- #include <sys/ipc.h>
- #include <sys/shm.h>
-+#include <stdbool.h>
- 
- #include <X11/Xlib.h>
- #include <X11/Intrinsic.h>
diff --git a/media-tv/xawtv/metadata.xml b/media-tv/xawtv/metadata.xml
deleted file mode 100644
index 8c450e10da82..000000000000
--- a/media-tv/xawtv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-    <flag name="xext">Enable use of XFree extensions (DGA,VidMode,DPMS)</flag>
-    <flag name="zvbi">Enable VBI Decoding Library for Zapping</flag>
-  </use>
-</pkgmetadata>
diff --git a/media-tv/xawtv/xawtv-3.95-r3.ebuild b/media-tv/xawtv/xawtv-3.95-r3.ebuild
deleted file mode 100644
index 429f21fa1914..000000000000
--- a/media-tv/xawtv/xawtv-3.95-r3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils font autotools flag-o-matic
-
-PATCHLEVEL="4"
-
-IUSE="aalib alsa dv lirc cpu_flags_x86_mmx motif nls opengl quicktime X xv zvbi xext"
-
-MY_FONT=tv-fonts-1.1
-DESCRIPTION="Small suite of video4linux related software"
-HOMEPAGE="http://bytesex.org/xawtv/"
-SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz
-	X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 )
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=sys-libs/ncurses-5.1
-	virtual/jpeg:0
-	X? (
-		x11-libs/libFS
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXrender
-		xext? (
-			x11-libs/libXinerama
-			x11-libs/libXxf86dga
-			x11-libs/libXrandr
-			x11-libs/libXxf86vm
-		)
-		x11-apps/xset
-		xv? ( x11-libs/libXv )
-	)
-	motif? ( >=x11-libs/motif-2.3:0
-		app-text/recode )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	dv? ( media-libs/libdv )
-	lirc? ( app-misc/lirc )
-	opengl? ( virtual/opengl )
-	quicktime? ( media-libs/libquicktime )
-	zvbi? ( media-libs/zvbi
-		media-libs/libpng:0 )"
-
-DEPEND="${RDEPEND}
-	X? (
-		x11-apps/xset
-		x11-apps/bdftopcf
-		x11-proto/videoproto
-		xext? ( x11-proto/xineramaproto )
-	)"
-
-pkg_setup() {
-	if use X; then
-		font_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if use X; then
-		cd "${WORKDIR}/${MY_FONT}"
-		epatch "${WORKDIR}/patches/extra/${MY_FONT}-nox.patch"
-	fi
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
-	epatch "${FILESDIR}/${P}-pagemask-fix.patch"
-	epatch "${FILESDIR}/${P}-jpeg-7.patch"
-	epatch "${FILESDIR}/${P}-stdbool.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# It tries to include FSlib.h directly, but this seems to have moved.
-	use X && has_version x11-libs/libFS && append-flags -I/usr/include/X11/fonts
-
-	econf \
-		$(use_with X x) \
-		$(use_enable xext xfree-ext) \
-		$(use_enable xv xvideo) \
-		$(use_enable dv)  \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable motif) \
-		$(use_enable quicktime) \
-		$(use_enable alsa) \
-		$(use_enable lirc) \
-		$(use_enable opengl gl) \
-		$(use_enable zvbi) \
-		$(use_enable aalib aa)
-}
-
-src_compile() {
-	emake verbose=yes
-
-	if use X; then
-		cd "${WORKDIR}/${MY_FONT}"
-		emake -j1 DISPLAY=
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" resdir="${D}"/usr/share/X11 || die
-
-	# v4lctl is only installed automatically if the X USE flag is enabled
-	use X || \
-		dobin x11/v4lctl
-
-	dodoc Changes README* TODO "${FILESDIR}"/webcamrc
-	docinto cgi-bin
-	dodoc scripts/webcam.cgi
-
-	use X || \
-		rm -f "${D}"/usr/share/man/man1/{pia,propwatch}.1 \
-			"${D}"/usr/share/{man,man/fr,man/es}/man1/xawtv.1 \
-			"${D}"/usr/share/{man,man/es}/man1/rootv.1
-
-	use motif || \
-		rm -f "${D}"/usr/share/man/man1/{motv,mtt}.1
-
-	use zvbi || \
-		rm -f "${D}"/usr/share/man/man1/{alevtd,mtt}.1 \
-			"${D}"/usr/share/{man,man/es}/man1/scantv.1
-
-	use nls || \
-		rm -f "${D}"/usr/share/man/fr \
-			"${D}"/usr/share/man/es
-
-	# The makefile seems to be fubar'd for some data
-	dodir /usr/share/${PN}
-	mv "${D}"/usr/share/*.list "${D}"/usr/share/${PN}
-	mv "${D}"/usr/share/Index* "${D}"/usr/share/${PN}
-
-	if use X; then
-		cd "${WORKDIR}/${MY_FONT}"
-		insinto /usr/share/fonts/xawtv
-		doins *.gz fonts.alias
-
-		font_xfont_config
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
-		cd /usr/share/fonts/xawtv
-		mkfontdir
-		eend
-	fi
-}
diff --git a/media-video/cheese/cheese-3.18.1-r1.ebuild b/media-video/cheese/cheese-3.18.1-r1.ebuild
index 85af3c823841..56c282d2767b 100644
--- a/media-video/cheese/cheese-3.18.1-r1.ebuild
+++ b/media-video/cheese/cheese-3.18.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # using clutter-gst-2.0.0 results in GLSL errors; bug #478702
 COMMON_DEPEND="
diff --git a/media-video/movit/files/movit-fix-locale.patch b/media-video/movit/files/movit-fix-locale.patch
new file mode 100644
index 000000000000..f98c9705e9f9
--- /dev/null
+++ b/media-video/movit/files/movit-fix-locale.patch
@@ -0,0 +1,16 @@
+--- a/init.cpp	2016-02-14 19:53:12.141197530 +0100
++++ b/init.cpp	2016-02-14 19:55:09.374196665 +0100
+@@ -388,7 +388,12 @@
+ 	// Now we have something on the form X.YY. We convert it to a float, and hope
+ 	// that if it's inexact (e.g. 1.30), atof() will round the same way the
+ 	// compiler will.
+-	float glsl_version = atof(glsl_version_str);
++	
++	std::istringstream locale_convert(glsl_version_str);
++	locale_convert.imbue(std::locale("C"));
++	double glsl_version;
++	locale_convert >> glsl_version;	
++	
+ 	free(glsl_version_str);
+ 
+ 	return glsl_version;
diff --git a/media-video/movit/movit-1.3.1.ebuild b/media-video/movit/movit-1.3.1-r1.ebuild
similarity index 90%
rename from media-video/movit/movit-1.3.1.ebuild
rename to media-video/movit/movit-1.3.1-r1.ebuild
index 08927148bea1..f5931deb44e5 100644
--- a/media-video/movit/movit-1.3.1.ebuild
+++ b/media-video/movit/movit-1.3.1-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+inherit eutils
+
 # no sane way to use OpenGL from within tests?
 RESTRICT="test"
 
@@ -26,6 +28,10 @@ RDEPEND="media-libs/mesa
 	"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/movit-fix-locale.patch"
+}
+
 src_compile() {
 	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
 }
diff --git a/media-video/pitivi/pitivi-0.95.ebuild b/media-video/pitivi/pitivi-0.95.ebuild
index 583aad287d17..2c48c932e085 100644
--- a/media-video/pitivi/pitivi-0.95.ebuild
+++ b/media-video/pitivi/pitivi-0.95.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.pitivi.org"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="v4l test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-video/snappy/snappy-1.0-r1.ebuild b/media-video/snappy/snappy-1.0-r1.ebuild
index bb9efdfde619..6bee87a6d518 100644
--- a/media-video/snappy/snappy-1.0-r1.ebuild
+++ b/media-video/snappy/snappy-1.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils gnome2
 DESCRIPTION="A simple media player written using GStreamer and Clutter"
 HOMEPAGE="https://wiki.gnome.org/Apps/Snappy"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
diff --git a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
index fa99db5b69c6..6cbf88731d79 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug nls"
 # opengl would mix gtk+:2 and :3 which is not possible
 
diff --git a/media-video/totem/totem-3.18.1.ebuild b/media-video/totem/totem-3.18.1.ebuild
index af3689da8221..31e0b776dd16 100644
--- a/media-video/totem/totem-3.18.1.ebuild
+++ b/media-video/totem/totem-3.18.1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 	zeitgeist? ( introspection )
 "
 
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index e79626c1e258..bcc5b1887e01 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="alternatechannel">Use alternate channel on record</flag>
-		<flag name="bidi">fribid support, for languages, written from right to left</flag>
+		<flag name="bidi">fribidi support, for languages, written from right to left</flag>
 		<flag name="ddepgentry">remove duplicate EPG entries</flag>
 		<flag name="dvlvidprefer">controls video-dir choice on recording</flag>
 		<flag name="graphtft">support for <pkg>media-plugins/vdr-grapftft</pkg>plugin up from vdr-graphtft-0.1.7</flag>
diff --git a/media-video/vlc/vlc-2.2.1-r1.ebuild b/media-video/vlc/vlc-2.2.1-r1.ebuild
index 1a8b9d39cecb..b2dbdf0af4ce 100644
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-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$
 
@@ -53,7 +53,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
 	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi"
 
 RDEPEND="
-		!<media-video/ffmpeg-1.2:0
+		!>=media-video/ffmpeg-3.0:0
 		dev-libs/libgpg-error:0
 		net-dns/libidn:0
 		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8f951dff4efb..6f07b9cce47e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Feb 2016 15:53:14 +0000
+Tue, 23 Feb 2016 15:26:16 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8f951dff4efb..6f07b9cce47e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Feb 2016 15:53:14 +0000
+Tue, 23 Feb 2016 15:26:16 +0000
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.18.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.18.1
index deba23b9805c..1a56e4677971 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.18.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Gtk module for bridging AT-SPI to Atk
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.17.90[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/atk-2.15.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/glib-2.32: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(-)?] >=sys-apps/dbus-1.5[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(-)?] !<gnome-extra/at-spi-1.32.0-r1
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.18/at-spi2-atk-2.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0179e8c035d2ee912eaf7bea322efdbc
+_md5_=aea8ae594ccb9b6bfe15a1f8d948a552
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.18.3 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.18.3
index cfdb2a0c92a1..127980f2f8e3 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.18.3
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.18.3
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=X +introspection 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36: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(-)?] >=sys-apps/dbus-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(-)?] x11-libs/libSM[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/libXi[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/libXtst[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) X? ( x11-libs/libX11[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/at-spi2-core/2.18/at-spi2-core-2.18.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1254215560faf150466ffede0c85d633
+_md5_=c8c737b3544bd8623ad4ef94d23a976b
diff --git a/metadata/md5-cache/app-accessibility/brltty-5.2 b/metadata/md5-cache/app-accessibility/brltty-5.2
index 0ae2f39424d5..b6924b0a2da4 100644
--- a/metadata/md5-cache/app-accessibility/brltty-5.2
+++ b/metadata/md5-cache/app-accessibility/brltty-5.2
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=s
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api ) tcl? ( api )
 SLOT=0
 SRC_URI=http://brltty.com/archive/brltty-5.2.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5df228dea6fc6424564f4d8caaaa2da1
diff --git a/metadata/md5-cache/app-accessibility/caribou-0.4.20 b/metadata/md5-cache/app-accessibility/caribou-0.4.20
index 58affbb1370a..73d4ae04313f 100644
--- a/metadata/md5-cache/app-accessibility/caribou-0.4.20
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.20
@@ -4,11 +4,11 @@ DESCRIPTION=Input assistive technology intended for switch and pointer users
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Caribou
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/gtk+-3:3[introspection] x11-libs/gtk+:2 >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst dev-libs/glib[dbus] >=dev-python/pyatspi-2.1.90[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3 gnome-base/librsvg:2 sys-apps/dbus
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.20.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2befe00b01f812b67c24b9fa7cea4dff
+_md5_=0039f31a9d4ace1c3cd1acb4c005a98a
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2 b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
index 56202d3aa60b..6468ea80aee1 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=jsapi? ( sun-bcla-jsapi ) freetts
 RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7c8a2472610ba330197bf07f1dad392
diff --git a/metadata/md5-cache/app-accessibility/freetts-1.2.2 b/metadata/md5-cache/app-accessibility/freetts-1.2.2
index fe6a0ad59ec9..bdd99f6d1f5e 100644
--- a/metadata/md5-cache/app-accessibility/freetts-1.2.2
+++ b/metadata/md5-cache/app-accessibility/freetts-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/freetts/freetts-1.2.2-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa2ddf286aaf4ac8882d1bd42fc1f5a0
diff --git a/metadata/md5-cache/app-accessibility/orca-3.18.2 b/metadata/md5-cache/app-accessibility/orca-3.18.2
index 1362867a06e4..c14c0bdea74a 100644
--- a/metadata/md5-cache/app-accessibility/orca-3.18.2
+++ b/metadata/md5-cache/app-accessibility/orca-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=Extensible screen reader that provides access to the desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Orca
 IUSE=+braille python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
 RDEPEND=python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-accessibility/at-spi2-atk-2.12:2 >=app-accessibility/at-spi2-core-2.12:2[introspection] >=dev-libs/atk-2.10 >=dev-libs/glib-2.28:2 >=dev-python/pygobject-3.10:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/liblouis[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/atk[introspection] dev-python/pyatspi[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setproctitle[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/3.18/orca-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=34f82648adddac43a12cb836384f8e7f
+_md5_=d55383229b50a495d8253caab91ecf28
diff --git a/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1 b/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
index 0e4a1cab1af0..3a3cbdbaf2dc 100644
--- a/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
+++ b/metadata/md5-cache/app-admin/389-admin-console-1.1.8-r1
@@ -10,5 +10,5 @@ PDEPEND=net-nds/389-admin
 RDEPEND=|| ( >=virtual/jre-1.5 >=virtual/jdk-1.5 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-admin-console-1.1.8.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edad47bcf1a9ae35fbcc2d7b4b3d554c
diff --git a/metadata/md5-cache/app-admin/389-console-1.1.7-r1 b/metadata/md5-cache/app-admin/389-console-1.1.7-r1
index 5f0da27c81b6..29d6361393ec 100644
--- a/metadata/md5-cache/app-admin/389-console-1.1.7-r1
+++ b/metadata/md5-cache/app-admin/389-console-1.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 >=dev-java/java-config-2.2.0
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/389-console-1.1.7.tar.bz2 https://dev.gentoo.org/~lxnay/389-console/fedora.png
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=892ae847c0551e11c500c8f03129ec60
diff --git a/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1 b/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
index 08ece415c7a7..0cdd83ec124b 100644
--- a/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
+++ b/metadata/md5-cache/app-admin/389-ds-console-1.2.6-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 ) dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/idm-console-framework-1.1 net-nds/389-ds-base >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://directory.fedoraproject.org/sources/389-ds-console-1.2.6.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40a800d981de104b50b90bb65c1a2b92
diff --git a/metadata/md5-cache/app-admin/collectd-5.4.1-r2 b/metadata/md5-cache/app-admin/collectd-5.4.1-r2
index a87c789b0e5a..c0592b6cfdc1 100644
--- a/metadata/md5-cache/app-admin/collectd-5.4.1-r2
+++ b/metadata/md5-cache/app-admin/collectd-5.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0 sys-devel/libtool perl? ( dev-lang/perl:=[ithreads]
 REQUIRED_USE=collectd_plugins_python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.4.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93bd3c7e2a00753e8131df2fb6cf7ff5
diff --git a/metadata/md5-cache/app-admin/collectd-5.5.0 b/metadata/md5-cache/app-admin/collectd-5.5.0
index 7d21b8dbf2d8..cc610090e03d 100644
--- a/metadata/md5-cache/app-admin/collectd-5.5.0
+++ b/metadata/md5-cache/app-admin/collectd-5.5.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libgcrypt:0 sys-devel/libtool perl? ( dev-lang/perl:=[ithreads]
 REQUIRED_USE=collectd_plugins_python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://collectd.org/files/collectd-5.5.0.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3213f682abb9206bb45b53e9d8bbb718
diff --git a/metadata/md5-cache/app-admin/consul-0.5.2-r1 b/metadata/md5-cache/app-admin/consul-0.5.2-r2
similarity index 91%
rename from metadata/md5-cache/app-admin/consul-0.5.2-r1
rename to metadata/md5-cache/app-admin/consul-0.5.2-r2
index 936660a34a18..e3e7c205ae67 100644
--- a/metadata/md5-cache/app-admin/consul-0.5.2-r1
+++ b/metadata/md5-cache/app-admin/consul-0.5.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.4:= dev-go/go-crypto:= test? ( dev-go/go-tools ) web? ( dev-ruby/sass dev-ruby/uglifier ) >=dev-vcs/git-1.8.2.1 >=dev-lang/go-1.4.2:= virtual/pkgconfig
+DEPEND=app-arch/zip >=dev-lang/go-1.4:= dev-go/go-crypto:= test? ( dev-go/go-tools ) web? ( dev-ruby/sass dev-ruby/uglifier ) >=dev-lang/go-1.4.2:= virtual/pkgconfig
 DESCRIPTION=A tool for service discovery, monitoring and configuration
 EAPI=5
 HOMEPAGE=http://www.consul.io
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> consul-0.5.2.tar.gz https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz -> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz -> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz -> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz -> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz -> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz -> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz -> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz -> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz -> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz -> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz -> dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz -> cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz -> columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	golang-base	1f6a08c05da2d91150032ff45db6a2c5	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=711ccdf90f434b8b9602f569ba58d845
+_eclasses_=golang-base	1f6a08c05da2d91150032ff45db6a2c5	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=f8c5012b4b45b1d87c60b283e897537a
diff --git a/metadata/md5-cache/app-admin/consul-0.6.3 b/metadata/md5-cache/app-admin/consul-0.6.3-r1
similarity index 93%
rename from metadata/md5-cache/app-admin/consul-0.6.3
rename to metadata/md5-cache/app-admin/consul-0.6.3-r1
index 6366b14af5ae..e300105b57c6 100644
--- a/metadata/md5-cache/app-admin/consul-0.6.3
+++ b/metadata/md5-cache/app-admin/consul-0.6.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=app-arch/zip >=dev-lang/go-1.4:= dev-go/go-crypto:= dev-go/go-sys:= >=dev-go/go-tools-0_pre20160121 >=dev-vcs/git-1.8.2.1 >=dev-lang/go-1.4.2:= virtual/pkgconfig
+DEPEND=app-arch/zip >=dev-lang/go-1.4:= dev-go/go-crypto:= dev-go/go-sys:= >=dev-go/go-tools-0_pre20160121 >=dev-lang/go-1.4.2:= virtual/pkgconfig
 DESCRIPTION=A tool for service discovery, monitoring and configuration
 EAPI=5
 HOMEPAGE=http://www.consul.io
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz https://github.com/armon/circbuf/archive/bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz -> circbuf-bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz https://github.com/armon/go-radix/archive/4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz -> go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz https://github.com/bgentry/speakeasy/archive/36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz -> speakeasy-36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz https://github.com/DataDog/datadog-go/archive/bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz -> datadog-go-bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz https://github.com/fsouza/go-dockerclient/archive/296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz -> go-dockerclient-296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz https://github.com/elazarl/go-bindata-assetfs/archive/57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz -> go-bindata-assetfs-57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz https://github.com/hashicorp/go-checkpoint/archive/e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz -> go-checkpoint-e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/12e90058b2897552deea141eff51bb7a07a09e63.tar.gz -> go-immutable-radix-12e90058b2897552deea141eff51bb7a07a09e63.tar.gz https://github.com/hashicorp/go-memdb/archive/31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz -> go-memdb-31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz https://github.com/hashicorp/go-reap/archive/2d85522212dcf5a84c6b357094f5c44710441912.tar.gz -> go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz https://github.com/hashicorp/memberlist/archive/9888dc523910e5d22c5be4f6e34520943df21809.tar.gz -> memberlist-9888dc523910e5d22c5be4f6e34520943df21809.tar.gz https://github.com/hashicorp/net-rpc-msgpackrpc/archive/a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz -> net-rpc-msgpackrpc-a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz https://github.com/hashicorp/raft-mdb/archive/55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz -> raft-mdb-55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz https://github.com/hashicorp/scada-client/archive/84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz -> scada-client-84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz https://github.com/hashicorp/yamux/archive/df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz -> yamux-df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-a0ff2567cfb70903282db057e799fd826784d41d.tar.gz https://github.com/mattn/go-isatty/archive/56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz -> go-isatty-56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz https://github.com/miekg/dns/archive/85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz -> dns-85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz https://github.com/mitchellh/cli/archive/cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz -> cli-cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz https://github.com/mitchellh/gox/archive/39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz -> gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz https://github.com/ryanuber/columnize/archive/983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz -> columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	golang-base	1f6a08c05da2d91150032ff45db6a2c5	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=b61b38634afcf0b06a3ba5c89b9e81e9
+_eclasses_=golang-base	1f6a08c05da2d91150032ff45db6a2c5	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=e2d9fbb1202c46c74f20f831ef683f6b
diff --git a/metadata/md5-cache/app-admin/consul-9999 b/metadata/md5-cache/app-admin/consul-9999
index c1b20e26b843..32c5a7cabe20 100644
--- a/metadata/md5-cache/app-admin/consul-9999
+++ b/metadata/md5-cache/app-admin/consul-9999
@@ -8,4 +8,4 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	golang-base	1f6a08c05da2d91150032ff45db6a2c5	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=564c0f161b7a9f978025829b90c9b8f0
+_md5_=7b1e6980640c2b28fe905ae4d8f1905c
diff --git a/metadata/md5-cache/app-admin/elektra-0.8.12 b/metadata/md5-cache/app-admin/elektra-0.8.12
index 68c94fd968bb..b24f050f8b50 100644
--- a/metadata/md5-cache/app-admin/elektra-0.8.12
+++ b/metadata/md5-cache/app-admin/elektra-0.8.12
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RESTRICT=test
 SLOT=0/0.8.12
 SRC_URI=ftp://ftp.markus-raab.org/elektra/releases/elektra-0.8.12.tar.gz
-_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a3f7b339cb39dd4d2394ba2fd39eb56
diff --git a/metadata/md5-cache/app-admin/elektra-9999 b/metadata/md5-cache/app-admin/elektra-9999
index c971a93aca1d..ad54c0975a4e 100644
--- a/metadata/md5-cache/app-admin/elektra-9999
+++ b/metadata/md5-cache/app-admin/elektra-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libltdl: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-libs/libxml2-2.9.1-r4[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(-)?] augeas? ( app-admin/augeas ) dbus? ( >=sys-apps/dbus-1.6.18-r1[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(-)?] ) iconv? ( >=virtual/libiconv-0-r1[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(-)?] ) java? ( >=virtual/jdk-1.8.0 ) qt5? ( >=dev-qt/qtdeclarative-5.3:5 >=dev-qt/qtgui-5.3:5 >=dev-qt/qttest-5.3:5 >=dev-qt/qtwidgets-5.3:5 ) uname? ( sys-apps/coreutils ) systemd? ( sys-apps/systemd[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(-)?] ) yajl? ( >=dev-libs/yajl-1.0.11-r1[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(-)?] ) java? ( >=dev-java/java-config-2.2.0 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-multilib	e82cd2608890af2e6a4965cc715b0135	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5841e418e548444a1206d3ccdb02528
diff --git a/metadata/md5-cache/app-admin/logstash-bin-2.1.2 b/metadata/md5-cache/app-admin/logstash-bin-2.1.3
similarity index 96%
rename from metadata/md5-cache/app-admin/logstash-bin-2.1.2
rename to metadata/md5-cache/app-admin/logstash-bin-2.1.3
index 624da53866e5..ebefbc8afc02 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-2.1.2
+++ b/metadata/md5-cache/app-admin/logstash-bin-2.1.3
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( virtual/jre:1.8 virtual/jre:1.7 )
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://download.elastic.co/logstash/logstash/logstash-2.1.2.tar.gz
+SRC_URI=https://download.elastic.co/logstash/logstash/logstash-2.1.3.tar.gz
 _md5_=3509f9473fc8f8c3b1d313fb2b06f397
diff --git a/metadata/md5-cache/app-admin/logstash-bin-2.2.1 b/metadata/md5-cache/app-admin/logstash-bin-2.2.2
similarity index 96%
rename from metadata/md5-cache/app-admin/logstash-bin-2.2.1
rename to metadata/md5-cache/app-admin/logstash-bin-2.2.2
index 6292622c4e5f..cf540a771ab8 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-2.2.1
+++ b/metadata/md5-cache/app-admin/logstash-bin-2.2.2
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RDEPEND=|| ( virtual/jre:1.8 virtual/jre:1.7 )
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://download.elastic.co/logstash/logstash/logstash-2.2.1.tar.gz
+SRC_URI=https://download.elastic.co/logstash/logstash/logstash-2.2.2.tar.gz
 _md5_=3509f9473fc8f8c3b1d313fb2b06f397
diff --git a/metadata/md5-cache/app-admin/mcollective-2.8.0 b/metadata/md5-cache/app-admin/mcollective-2.8.0
index 73e973bfda89..783d9272cd12 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.8.0
+++ b/metadata/md5-cache/app-admin/mcollective-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/stomp ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://puppetlabs.com/downloads/mcollective/mcollective-2.8.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f3ad96471699789d25a7b2313a6feb9
diff --git a/metadata/md5-cache/app-admin/puppet-3.7.3-r1 b/metadata/md5-cache/app-admin/puppet-3.7.3-r1
index bd37653e6db6..d4bbe54b294b 100644
--- a/metadata/md5-cache/app-admin/puppet-3.7.3-r1
+++ b/metadata/md5-cache/app-admin/puppet-3.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.7.3.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=506a497e3e763e0d50a5823c86e3c969
diff --git a/metadata/md5-cache/app-admin/puppet-3.7.4-r3 b/metadata/md5-cache/app-admin/puppet-3.7.4-r3
index dadff9b02597..cf42fb6d4d69 100644
--- a/metadata/md5-cache/app-admin/puppet-3.7.4-r3
+++ b/metadata/md5-cache/app-admin/puppet-3.7.4-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.7.4.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=6f39420b64908f40aed6245fab168a15
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.1-r1 b/metadata/md5-cache/app-admin/puppet-3.8.1-r1
index 62926d2c7af0..55ef44ff5b70 100644
--- a/metadata/md5-cache/app-admin/puppet-3.8.1-r1
+++ b/metadata/md5-cache/app-admin/puppet-3.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.8.1.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=df46cdb6ab69cbed55da17fdc7a47838
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.2 b/metadata/md5-cache/app-admin/puppet-3.8.2
index 8218fafb2dff..9430db5714be 100644
--- a/metadata/md5-cache/app-admin/puppet-3.8.2
+++ b/metadata/md5-cache/app-admin/puppet-3.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.8.2.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=df46cdb6ab69cbed55da17fdc7a47838
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.3 b/metadata/md5-cache/app-admin/puppet-3.8.3
index 054383d2f1e0..2832557483fb 100644
--- a/metadata/md5-cache/app-admin/puppet-3.8.3
+++ b/metadata/md5-cache/app-admin/puppet-3.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.8.3.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=df46cdb6ab69cbed55da17fdc7a47838
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.4 b/metadata/md5-cache/app-admin/puppet-3.8.4
index ce6f3d8f4ba0..f5551decca0a 100644
--- a/metadata/md5-cache/app-admin/puppet-3.8.4
+++ b/metadata/md5-cache/app-admin/puppet-3.8.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hiera[ruby_targets_ruby19] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.8.4.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=df46cdb6ab69cbed55da17fdc7a47838
diff --git a/metadata/md5-cache/app-admin/puppet-3.8.5 b/metadata/md5-cache/app-admin/puppet-3.8.5
index 3a470ea278e3..128798516ff8 100644
--- a/metadata/md5-cache/app-admin/puppet-3.8.5
+++ b/metadata/md5-cache/app-admin/puppet-3.8.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/hiera[ruby_targets_ruby20] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-3.8.5.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=127331af1ef3fadb2cc227fae9f7e940
diff --git a/metadata/md5-cache/app-admin/puppet-4.0.0-r3 b/metadata/md5-cache/app-admin/puppet-4.0.0-r3
index 9edeaf49fbe7..e07192742374 100644
--- a/metadata/md5-cache/app-admin/puppet-4.0.0-r3
+++ b/metadata/md5-cache/app-admin/puppet-4.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/hiera[ruby_targets_ruby20] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.0.0.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=4d4fb7c9b323f7ff983597f558333e3e
diff --git a/metadata/md5-cache/app-admin/puppet-4.1.0-r1 b/metadata/md5-cache/app-admin/puppet-4.1.0-r1
index 24edb023839a..e082ce4b3e97 100644
--- a/metadata/md5-cache/app-admin/puppet-4.1.0-r1
+++ b/metadata/md5-cache/app-admin/puppet-4.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/hiera[ruby_targets_ruby20] >=dev-ruby/rg
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.1.0.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=4d4fb7c9b323f7ff983597f558333e3e
diff --git a/metadata/md5-cache/app-admin/puppet-4.2.1-r1 b/metadata/md5-cache/app-admin/puppet-4.2.1-r1
index 6450bd44a4a1..ba7c2713aa52 100644
--- a/metadata/md5-cache/app-admin/puppet-4.2.1-r1
+++ b/metadata/md5-cache/app-admin/puppet-4.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.2.1.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=7dcc76bdc0b3460d8c1efe2efd47d910
diff --git a/metadata/md5-cache/app-admin/puppet-4.2.2-r1 b/metadata/md5-cache/app-admin/puppet-4.2.2-r1
index cbf5decc397b..43432dc8bd3b 100644
--- a/metadata/md5-cache/app-admin/puppet-4.2.2-r1
+++ b/metadata/md5-cache/app-admin/puppet-4.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.2.2.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xemacs-elisp-common	7f4f0cd4db5971a415fe6d9208c64116
 _md5_=7dcc76bdc0b3460d8c1efe2efd47d910
diff --git a/metadata/md5-cache/app-admin/puppet-lint-0.3.2 b/metadata/md5-cache/app-admin/puppet-lint-0.3.2
index 3759e79c5908..b0ab2d76b80d 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-0.3.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-0.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3dafa737ca689240e017e77d8b1355d
diff --git a/metadata/md5-cache/app-admin/puppet-lint-1.1.0 b/metadata/md5-cache/app-admin/puppet-lint-1.1.0
index 0c325b0461a0..96908e5b603e 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-1.1.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/puppet-lint-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a08df96ff0d9f70b808806312e135ad9
diff --git a/metadata/md5-cache/app-admin/r10k-1.1.3-r1 b/metadata/md5-cache/app-admin/r10k-1.1.3-r1
index d24e1c431d74..2adde57701e8 100644
--- a/metadata/md5-cache/app-admin/r10k-1.1.3-r1
+++ b/metadata/md5-cache/app-admin/r10k-1.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/r10k-1.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64019f9123ddb1a515182781a1b59a41
diff --git a/metadata/md5-cache/app-admin/r10k-1.5.1 b/metadata/md5-cache/app-admin/r10k-1.5.1
index 183174964c66..684b778d987d 100644
--- a/metadata/md5-cache/app-admin/r10k-1.5.1
+++ b/metadata/md5-cache/app-admin/r10k-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/r10k-1.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c6d1d3458845c86a702a8559efe6b08
diff --git a/metadata/md5-cache/app-admin/rex-1.4.0_rc2 b/metadata/md5-cache/app-admin/rex-1.4.0_rc3
similarity index 95%
rename from metadata/md5-cache/app-admin/rex-1.4.0_rc2
rename to metadata/md5-cache/app-admin/rex-1.4.0_rc3
index 463a81d6fc4e..555f24ff5964 100644
--- a/metadata/md5-cache/app-admin/rex-1.4.0_rc2
+++ b/metadata/md5-cache/app-admin/rex-1.4.0_rc3
@@ -7,6 +7,6 @@ IUSE=test
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/DBI dev-perl/Devel-Caller dev-perl/Digest-HMAC dev-perl/Digest-SHA1 dev-perl/Expect dev-perl/Hash-Merge dev-perl/IO-String dev-perl/IO-Tty dev-perl/IPC-Shareable dev-perl/JSON-XS dev-perl/List-MoreUtils dev-perl/Net-OpenSSH dev-perl/Net-SFTP-Foreign dev-perl/Parallel-ForkManager dev-perl/Sort-Naturally dev-perl/String-Escape dev-perl/TermReadKey dev-perl/Test-Deep dev-perl/Text-Glob dev-perl/URI dev-perl/XML-LibXML dev-perl/XML-Simple dev-perl/libwww-perl dev-perl/yaml virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-MIME-Base64 virtual/perl-Scalar-List-Utils virtual/perl-Storable virtual/perl-Time-HiRes dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.3.3_02.tar.gz
+SRC_URI=mirror://cpan/authors/id/F/FE/FERKI/Rex-1.3.3_03.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=9a3c7e371d04d221101203f24f967594
+_md5_=22f46fac6956261c7c39a322b422208f
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r5 b/metadata/md5-cache/app-admin/setools-3.3.8-r5
index 286e05a666a5..171a7b2673fa 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r5
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r5
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.1.4 >=sys-libs/libselinux-2.3 >=dev-db/sqlite-3.2:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 https://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-01-fedora-patches.tar.gz https://dev.gentoo.org/~swift/patches/setools/setools-3.3.8-03-gentoo-patches.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f168aeea87fd7703734ede6fc63d723f
diff --git a/metadata/md5-cache/app-admin/setools-3.3.8-r7 b/metadata/md5-cache/app-admin/setools-3.3.8-r7
index 70d2984d25cf..597ecadec770 100644
--- a/metadata/md5-cache/app-admin/setools-3.3.8-r7
+++ b/metadata/md5-cache/app-admin/setools-3.3.8-r7
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.4 >=sys-libs/libselinux-2.4 >=dev-db/sqlite-3.2:3
 RESTRICT=test
 SLOT=0
 SRC_URI=http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.8/setools-3.3.8.tar.bz2 https://dev.gentoo.org/~perfinion/patches/setools/setools-3.3.8-04-gentoo-patches.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8000d3e1bc6ec352dc6fd3b2afd353ef
diff --git a/metadata/md5-cache/app-admin/vault-0.1.2-r1 b/metadata/md5-cache/app-admin/vault-0.1.2-r1
deleted file mode 100644
index 2b947ec951c3..000000000000
--- a/metadata/md5-cache/app-admin/vault-0.1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-go/go-oauth2:= filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.4.2:= virtual/pkgconfig
-DESCRIPTION=A tool for managing secrets
-EAPI=5
-HOMEPAGE=https://vaultproject.io/
-IUSE=+filecaps
-KEYWORDS=~amd64
-LICENSE=MPL-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hashicorp/vault/archive/v0.1.2.tar.gz -> vault-0.1.2.tar.gz https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz -> gox-0.3.0.tar.gz https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz -> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	golang-base	1f6a08c05da2d91150032ff45db6a2c5	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=533efb846b08cbfe3dff35dc104b41cd
diff --git a/metadata/md5-cache/app-admin/vault-0.4.1 b/metadata/md5-cache/app-admin/vault-0.4.1
index 1b81573c71ad..335a24c81b54 100644
--- a/metadata/md5-cache/app-admin/vault-0.4.1
+++ b/metadata/md5-cache/app-admin/vault-0.4.1
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v0.4.1.tar.gz -> vault-0.4.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	golang-base	1f6a08c05da2d91150032ff45db6a2c5	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=be0cd7fd660cbb0813265a70da812419
+_md5_=8742e101dd8210837e8a0d495605d231
diff --git a/metadata/md5-cache/app-admin/vault-9999 b/metadata/md5-cache/app-admin/vault-9999
index 46013c39496b..59b8e91e4a4e 100644
--- a/metadata/md5-cache/app-admin/vault-9999
+++ b/metadata/md5-cache/app-admin/vault-9999
@@ -8,4 +8,4 @@ LICENSE=MPL-2.0
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	git-r3	ef66dfc3db09f327af21cf32f140fb2b	golang-base	1f6a08c05da2d91150032ff45db6a2c5	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=36386b546867c7c92f5b71c127bd5c6d
+_md5_=9db9cb1b181f07c0fa63c191e15dd4f8
diff --git a/metadata/md5-cache/app-arch/file-roller-3.16.4-r1 b/metadata/md5-cache/app-arch/file-roller-3.16.4-r1
index 9339e8e2b7d7..a872e5217e05 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.16.4-r1
+++ b/metadata/md5-cache/app-arch/file-roller-3.16.4-r1
@@ -4,10 +4,10 @@ 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
+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	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6f44c3db314b1869ef56f1a292f8be8e
+_md5_=8744efe4e6dacf76d93eff03472c6a30
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1 b/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
new file mode 100644
index 000000000000..be59a20eeeba
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/bonnie++-1.97-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Hard drive bottleneck testing benchmark suite
+EAPI=6
+HOMEPAGE=http://www.coker.com.au/bonnie++/
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.coker.com.au/bonnie++/experimental/bonnie++-1.97.tgz
+_md5_=c3842990229bbd100eacaf6924e465fc
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
index a6dbecb59c44..20e6418412d6 100644
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=36509d4aeaf28e6530692aea140dde90
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
index cab61de3c162..4ecd3b5f625f 100644
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 beanshell? ( dev-java/bsh ) >=dev-java/bsf-2.3 =dev-java/junit-3.8* java-virtuals/javamail >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cd6bc1f9e4a6a6126868011f042cb7b
diff --git a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6 b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
index d4d3c484b79e..881ab9e0046f 100644
--- a/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
+++ b/metadata/md5-cache/app-benchmarks/jmeter-2.0.1-r6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/jre:1.7 beanshell? ( dev-java/bsh:0 ) dev-java/bsf:2.3 dev-java/junit:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/jmeter/source/jakarta-jmeter-2.0.1_src.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff414e13500ffabe6c903561012f9cc8
diff --git a/metadata/md5-cache/app-cdr/brasero-3.12.1-r1 b/metadata/md5-cache/app-cdr/brasero-3.12.1-r1
index 46cef0aaedc9..04513c353a58 100644
--- a/metadata/md5-cache/app-cdr/brasero-3.12.1-r1
+++ b/metadata/md5-cache/app-cdr/brasero-3.12.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=CD/DVD burning application for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Brasero
 IUSE=+css +introspection +libburn mp3 nautilus packagekit playlist test tracker
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 PDEPEND=gnome-base/gvfs
 RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-0.6.3:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-0.12:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) mp3? ( media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-mad:1.0 ) packagekit? ( app-admin/packagekit-base )
 SLOT=0/3.1
 SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e7753b56cd2033ee3deee2d2a5bb22e3
+_md5_=ad26ccf37018a4704c6578a3716f2ebf
diff --git a/metadata/md5-cache/app-cdr/cdrdao-1.2.3-r2 b/metadata/md5-cache/app-cdr/cdrdao-1.2.3-r2
index 757891e257c4..7f942bf2551c 100644
--- a/metadata/md5-cache/app-cdr/cdrdao-1.2.3-r2
+++ b/metadata/md5-cache/app-cdr/cdrdao-1.2.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Burn CDs in disk-at-once mode -- with optional GUI frontend
 EAPI=5
 HOMEPAGE=http://cdrdao.sourceforge.net/
 IUSE=gcdmaster encode mad vorbis
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) gcdmaster? ( >=dev-libs/libsigc++-2.6:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libgnomeuimm-2.6:2.6 media-libs/libao ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc !dev-util/pccts
 SLOT=0
 SRC_URI=mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=de672af25a74b80286dd17f5db561f4c
+_md5_=235aa3c449d4906cd009b802f8c8f604
diff --git a/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2 b/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
index e220ceb3e9be..6c82692b03f1 100644
--- a/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
+++ b/metadata/md5-cache/app-cdr/webcdwriter-2.8.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 app-cdr/cdrdao virtual/cdrtools mp3? ( media-sound/mpg123 ) sox? ( media-sound/sox ) vorbis? ( media-sound/vorbis-tools ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://joerghaeger.de/webCDwriter/download/webCDwriter-2.8.2.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=36457415674229b56ceb121d547143f5
diff --git a/metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3 b/metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
new file mode 100644
index 000000000000..62eeb7d70bad
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=app-crypt/jetring
+DESCRIPTION=GnuPG archive keys of the Debian archive
+EAPI=5
+HOMEPAGE=http://packages.debian.org/sid/debian-archive-keyring
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debian-archive-keyring/debian-archive-keyring_2014.3.tar.xz
+_md5_=654b54aaf828f3e72fc2647ba7261249
diff --git a/metadata/md5-cache/app-crypt/gcr-3.18.0 b/metadata/md5-cache/app-crypt/gcr-3.18.0
index 0ac5a771a5e7..c94a9e13b8c4 100644
--- a/metadata/md5-cache/app-crypt/gcr-3.18.0
+++ b/metadata/md5-cache/app-crypt/gcr-3.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gcr
 IUSE=debug gtk +introspection vala test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-crypt/gnupg-2 >=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) !<gnome-base/gnome-keyring-3.3
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gcr/3.18/gcr-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d48e70db0d260a2a10fb686977af8e9b
+_md5_=949c05a27e70310a97aa312b92934042
diff --git a/metadata/md5-cache/app-crypt/gkeys-0.2 b/metadata/md5-cache/app-crypt/gkeys-0.2
index bda435048969..387b66179552 100644
--- a/metadata/md5-cache/app-crypt/gkeys-0.2
+++ b/metadata/md5-cache/app-crypt/gkeys-0.2
@@ -4,11 +4,11 @@ DESCRIPTION=An OpenPGP/GPG key management tool for seed files and keyrings
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg >=dev-python/pyGPG-0.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(-)] >=dev-python/ssl-fetch-0.4[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(-)] dev-python/snakeoil[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(-)] >=app-crypt/gentoo-keys-201501052117 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=https://dev.gentoo.org/~dolsen/releases/gkeys/gkeys-0.2.tar.bz2
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0f07f22199bd296984fe58ea1cecf8f9
+_md5_=dd2a0c51ef977d5b4ebe3c350042a6e6
diff --git a/metadata/md5-cache/app-crypt/gkeys-gen-0.2 b/metadata/md5-cache/app-crypt/gkeys-gen-0.2
index 52ad2e8a0fe1..879e9f17b187 100644
--- a/metadata/md5-cache/app-crypt/gkeys-gen-0.2
+++ b/metadata/md5-cache/app-crypt/gkeys-gen-0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for generating OpenPGP/GPG keys using a specifications file
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg dev-python/snakeoil[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/pygpgme[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(-)] =app-crypt/gkeys-0.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(-)] 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://dev.gentoo.org/~dolsen/releases/gkeys-gen/gkeys-gen-0.2.tar.bz2
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=cd746ae2a405e36a1ecc96888e72cd88
+_md5_=188c862f5559a95f75f1d9021cf875cc
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.1.11-r1 b/metadata/md5-cache/app-crypt/gnupg-2.1.11-r1
index df8a7fb16819..b7a6dd6c6306 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.1.11-r1
+++ b/metadata/md5-cache/app-crypt/gnupg-2.1.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc +gnutls ldap nls readline static selinux smartcard tofu tools usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/npth >=dev-libs/libassuan-2.4.1 >=dev-libs/libgcrypt-1.6.2[threads] >=dev-libs/libgpg-error-1.21 >=dev-libs/libksba-1.2.0 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0 ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 REQUIRED_USE=smartcard? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.11.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=84fea34a20bca193d2a145e6559f657b
+_md5_=f90e863ca160fb59d0b7911df59c82ea
diff --git a/metadata/md5-cache/app-crypt/jacksum-1.7.0 b/metadata/md5-cache/app-crypt/jacksum-1.7.0
index 8eef574f50d6..2a82347c557c 100644
--- a/metadata/md5-cache/app-crypt/jacksum-1.7.0
+++ b/metadata/md5-cache/app-crypt/jacksum-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.3.1 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jacksum/jacksum-1.7.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60b532c80000154241b287103f29912a
diff --git a/metadata/md5-cache/app-crypt/jetring-0.21 b/metadata/md5-cache/app-crypt/jetring-0.21
new file mode 100644
index 000000000000..2868f78ac152
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/jetring-0.21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-crypt/gnupg
+DESCRIPTION=GPG keyring maintenance using changesets
+EAPI=5
+HOMEPAGE=http://joeyh.name/code/jetring/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/gnupg dev-lang/perl
+SLOT=0
+SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.21.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=14740258833ba44ecf34363a9ae25837
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.4 b/metadata/md5-cache/app-crypt/libsecret-0.18.4
index 255f0ede0260..c34e7b09ad3b 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.4
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.4
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 IUSE=+crypt +introspection test vala debug test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -12,4 +12,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=850c3b97576ba04a90dabc05c22fda6a
+_md5_=0caece63f9dcd6f8a24e3690003a529c
diff --git a/metadata/md5-cache/app-crypt/sbsigntool-0.6 b/metadata/md5-cache/app-crypt/sbsigntool-0.6
deleted file mode 100644
index e75cfccf0acc..000000000000
--- a/metadata/md5-cache/app-crypt/sbsigntool-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
-DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
-EAPI=4
-HOMEPAGE=https://launchpad.net/ubuntu/+source/sbsigntool
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/openssl sys-apps/util-linux
-SLOT=0
-SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/sbsigntool_0.6.orig.tar.gz
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c63ac4ea23f48179cc3c24187683a14e
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.18.0 b/metadata/md5-cache/app-crypt/seahorse-3.18.0
index cd2a6070e4b1..48ded58a1a69 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.18.0
+++ b/metadata/md5-cache/app-crypt/seahorse-3.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=A GNOME application for managing encryption keys
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
 IUSE=debug ldap zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 >=app-crypt/gnupg-2.0.12 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) !<app-crypt/seahorse-plugins-2.91.0_pre20110114
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.18/seahorse-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=68ebd04b6fdc2d4cc1e1bc32f83497c8
+_md5_=1148063fdfb712416c30e81e82c63230
diff --git a/metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117 b/metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117
index b49cbdd6fde8..90e2f24857df 100644
--- a/metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117
+++ b/metadata/md5-cache/app-crypt/seahorse-sharing-3.8.0_p20151117
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon for PGP public key sharing using DNS-SD and HKP
 EAPI=5
 HOMEPAGE=https://projects.gnome.org/seahorse/
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-crypt/seahorse dev-libs/glib:2 >=net-dns/avahi-0.6:= net-libs/libsoup:2.4 >=x11-libs/gtk+-3:3 >=app-crypt/gpgme-1 >=app-crypt/gnupg-1.4 !<app-crypt/seahorse-3.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~eva/distfiles/seahorse-sharing/seahorse-sharing-3.8.0-19-g61de83c.tar.gz -> seahorse-sharing-3.8.0_p20151117.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=650b6f42a612cad7f0ceabb8f58670f8
+_md5_=36e238e0e0ceffcc807d8af7d3174b68
diff --git a/metadata/md5-cache/app-crypt/ubuntu-keyring-2012.05.19 b/metadata/md5-cache/app-crypt/ubuntu-keyring-2012.05.19
new file mode 100644
index 000000000000..52ad4b04b925
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/ubuntu-keyring-2012.05.19
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=GnuPG archive keys of the Ubuntu archive
+EAPI=5
+HOMEPAGE=http://packages.ubuntu.com/vivid/ubuntu-keyring
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2012.05.19.tar.gz
+_md5_=b0110de4985770df6b8aad5b04a4ebd7
diff --git a/metadata/md5-cache/app-dicts/gnome-dictionary-3.18.1 b/metadata/md5-cache/app-dicts/gnome-dictionary-3.18.1
index a6911ccc6573..62cafb036102 100644
--- a/metadata/md5-cache/app-dicts/gnome-dictionary-3.18.1
+++ b/metadata/md5-cache/app-dicts/gnome-dictionary-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Dictionary utility for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Dictionary
 IUSE=+introspection ipv6 debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.39:2[dbus] x11-libs/cairo:= >=x11-libs/gtk+-3.14:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.42:= ) gnome-base/gsettings-desktop-schemas !<gnome-extra/gnome-utils-3.4
 SLOT=0/9
 SRC_URI=mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4ded065001a127923b63f4cd3cc7e147
+_md5_=3ce9ee7d547039edca1784b7c1a410b3
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2
index a00def5c08fe..a609ca464837 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5fafa64996bde30655ded3dca1288249
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
index 2081b3ad2c88..ff02f1442568 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=114f4c6e3468c62f05ba7f7727738b6e
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-2.6.11 b/metadata/md5-cache/app-doc/gnucash-docs-2.6.11
index 17b0778ff1bc..fe8c32722b4c 100644
--- a/metadata/md5-cache/app-doc/gnucash-docs-2.6.11
+++ b/metadata/md5-cache/app-doc/gnucash-docs-2.6.11
@@ -4,10 +4,10 @@ DESCRIPTION=Documentation package for GnuCash
 EAPI=5
 HOMEPAGE=http://www.gnucash.org/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=!<=app-office/gnucash-2.2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/gnucash/gnucash-docs-2.6.11.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fee25dddb7f7e260d8a686f0b11517a6
+_md5_=3b9c16366a28388f2e8037246b94e1ba
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.4 b/metadata/md5-cache/app-editors/diakonos-0.9.4
index 943f7c4c668b..7cd547f31541 100644
--- a/metadata/md5-cache/app-editors/diakonos-0.9.4
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89bb4e12b4193037ceafe664dfe5ce9f
diff --git a/metadata/md5-cache/app-editors/gedit-3.18.3 b/metadata/md5-cache/app-editors/gedit-3.18.3
index f840a778996a..07a4d4a79674 100644
--- a/metadata/md5-cache/app-editors/gedit-3.18.3
+++ b/metadata/md5-cache/app-editors/gedit-3.18.3
@@ -4,11 +4,11 @@ DESCRIPTION=A text editor for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
 IUSE=+introspection +python spell vala python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libxml2-2.5.0:2 >=dev-libs/glib-2.44:2[dbus] >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/gtksourceview-3.18:3.0[introspection?] >=dev-libs/libpeas-1.14.1[gtk] gnome-base/gsettings-desktop-schemas gnome-base/gvfs x11-libs/libX11 net-libs/libsoup:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) python? ( 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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libpeas[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) spell? ( >=app-text/enchant-1.2:= >=app-text/iso-codes-0.35 ) x11-themes/adwaita-icon-theme
 REQUIRED_USE=python? ( introspection ) python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.18/gedit-3.18.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3a7557e78d1a6a9c72dfb659beb1b27a
+_md5_=b57a0bb638e04ab7ac470f27dbdcfa56
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-3.18.0 b/metadata/md5-cache/app-editors/gedit-plugins-3.18.0
index 338c6432c80d..bf3eeca39447 100644
--- a/metadata/md5-cache/app-editors/gedit-plugins-3.18.0
+++ b/metadata/md5-cache/app-editors/gedit-plugins-3.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=Official plugins for gedit
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins
 IUSE=+python charmap git terminal vala zeitgeist python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/gedit-3.16[python?] >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[gtk,python?] >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-3.17.3:3.0 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-editors/gedit-3.16[introspection,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libpeas[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dbus-python-0.82[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[cairo,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6 ) terminal? ( x11-libs/vte:2.91[introspection] ) vala? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 ) ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12[introspection] )
 REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) ) terminal? ( python ) zeitgeist? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit-plugins/3.18/gedit-plugins-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b1d12d4be9306f4d1fe5e2e3a96939d6
+_md5_=4ac289006725e41481a341b9f7d781f3
diff --git a/metadata/md5-cache/app-editors/ghex-3.18.0 b/metadata/md5-cache/app-editors/ghex-3.18.0
index 6df1f8c7e7c3..1afa57411cf0 100644
--- a/metadata/md5-cache/app-editors/ghex-3.18.0
+++ b/metadata/md5-cache/app-editors/ghex-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=dev-
 DESCRIPTION=GNOME hexadecimal editor
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=572fd53b9d5c005af10c7751d960e046
+_md5_=10f36e2a03d2f101c5cb4f32ba3860ed
diff --git a/metadata/md5-cache/app-editors/jedit-5.0.0 b/metadata/md5-cache/app-editors/jedit-5.0.0
index 1385117b5511..5ae905c585be 100644
--- a/metadata/md5-cache/app-editors/jedit-5.0.0
+++ b/metadata/md5-cache/app-editors/jedit-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.0.0source.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e38e470681d1c905a0c5a80b7819b02
diff --git a/metadata/md5-cache/app-editors/jedit-5.2.0 b/metadata/md5-cache/app-editors/jedit-5.2.0
index bb35771902e9..e968b5a87e09 100644
--- a/metadata/md5-cache/app-editors/jedit-5.2.0
+++ b/metadata/md5-cache/app-editors/jedit-5.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jedit/jedit5.2.0source.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=351862c28364bd4dface526e7a6e17c1
diff --git a/metadata/md5-cache/app-editors/jext-5.0-r2 b/metadata/md5-cache/app-editors/jext-5.0-r2
index 3d5be59f0cbb..8ea7e839229d 100644
--- a/metadata/md5-cache/app-editors/jext-5.0-r2
+++ b/metadata/md5-cache/app-editors/jext-5.0-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 JPython )
 RDEPEND=>=virtual/jre-1.6 dev-java/jython:2.7 dev-java/jgoodies-looks:1.2 dev-java/gnu-regexp:1 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jext/jext-sources-5.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7bbebbaf0fb9d1282166d588185300bf
diff --git a/metadata/md5-cache/app-editors/latexila-3.18.2 b/metadata/md5-cache/app-editors/latexila-3.18.2
index d32fbac8fc03..4a90dbeae128 100644
--- a/metadata/md5-cache/app-editors/latexila-3.18.2
+++ b/metadata/md5-cache/app-editors/latexila-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Integrated LaTeX environment for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/LaTeXila
 IUSE=+introspection +latexmk rubber
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=|| ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] ) app-text/enchant =app-text/gspell-0.1* >=dev-libs/glib-2.40:2[dbus] >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.14:3 >=x11-libs/gtksourceview-3.18:3.0 x11-libs/gdk-pixbuf:2 x11-libs/libX11 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
 SLOT=0
 SRC_URI=mirror://gnome/sources/latexila/3.18/latexila-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5073b2e228efab5853d5f535f5586947
+_md5_=4053c69904088b5f819a85f276b49e46
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1 b/metadata/md5-cache/app-emacs/jde-2.4.1
index 2efaa7c51b68..2103d870414f 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3 app-emacs/elib dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b2bcc4e0f84c2498708e741827e4bb2
diff --git a/metadata/md5-cache/app-emulation/docker-swarm-0.4.0 b/metadata/md5-cache/app-emulation/docker-swarm-0.4.0
deleted file mode 100644
index c7cd864a40e6..000000000000
--- a/metadata/md5-cache/app-emulation/docker-swarm-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4.2:=
-DESCRIPTION=A Docker-native clustering system
-EAPI=5
-HOMEPAGE=https://docs.docker.com/swarm/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/docker/swarm/archive/v0.4.0.tar.gz -> docker-swarm-0.4.0.tar.gz
-_eclasses_=golang-base	1f6a08c05da2d91150032ff45db6a2c5	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a
-_md5_=ffcfd6801738cd4203706c49b8cec49f
diff --git a/metadata/md5-cache/app-emulation/docker-swarm-1.0.1 b/metadata/md5-cache/app-emulation/docker-swarm-1.0.1
index 7d60bf61797d..6ad5130f3062 100644
--- a/metadata/md5-cache/app-emulation/docker-swarm-1.0.1
+++ b/metadata/md5-cache/app-emulation/docker-swarm-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4.2:=
+DEPEND=!!<app-admin/consul-0.6.3-r1 >=dev-lang/go-1.4.2:=
 DESCRIPTION=A Docker-native clustering system
 EAPI=5
 HOMEPAGE=https://docs.docker.com/swarm/
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/docker/swarm/archive/v1.0.1.tar.gz -> docker-swarm-1.0.1.tar.gz
 _eclasses_=golang-base	1f6a08c05da2d91150032ff45db6a2c5	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a
-_md5_=ffcfd6801738cd4203706c49b8cec49f
+_md5_=ae2f7e1004628f902264624d8859cb53
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.1 b/metadata/md5-cache/app-emulation/edumips64-1.1
index 109ce0683d31..94cf313d25cc 100644
--- a/metadata/md5-cache/app-emulation/edumips64-1.1
+++ b/metadata/md5-cache/app-emulation/edumips64-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/edumips64/edumips64-1.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=80d6853d25cf222ef42e16bec6a66b50
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.2 b/metadata/md5-cache/app-emulation/edumips64-1.2
index c5fb13011979..32852acbb1a4 100644
--- a/metadata/md5-cache/app-emulation/edumips64-1.2
+++ b/metadata/md5-cache/app-emulation/edumips64-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/edumips64/edumips64-1.2.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf167f532cd5ae65b3d6aebe2ff3416c
diff --git a/metadata/md5-cache/app-emulation/libcacard-0.1.2 b/metadata/md5-cache/app-emulation/libcacard-0.1.2
index 13c479fc2f10..a7672a7e28c3 100644
--- a/metadata/md5-cache/app-emulation/libcacard-0.1.2
+++ b/metadata/md5-cache/app-emulation/libcacard-0.1.2
@@ -1,7 +1,7 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/nss-3.13 >=sys-apps/pcsc-lite-1.8 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/nss-3.13 >=sys-apps/pcsc-lite-1.8 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
 DESCRIPTION=Library for emulating CAC cards
-EAPI=4
+EAPI=6
 HOMEPAGE=http://spice-space.org/
 IUSE=static-libs
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
@@ -9,4 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/nss-3.13 >=sys-apps/pcsc-lite-1.8
 SLOT=0
 SRC_URI=http://spice-space.org/download/libcacard/libcacard-0.1.2.tar.bz2
-_md5_=0aa79b3beba98cc05971c3a071fd4d13
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=b2d46fe139a31cd4e82934291641826d
diff --git a/metadata/md5-cache/app-emulation/libvirt-glib-0.2.3 b/metadata/md5-cache/app-emulation/libvirt-glib-0.2.3
index 9a305b804ec6..1ed9f15e5451 100644
--- a/metadata/md5-cache/app-emulation/libvirt-glib-0.2.3
+++ b/metadata/md5-cache/app-emulation/libvirt-glib-0.2.3
@@ -4,7 +4,7 @@ DESCRIPTION=GLib and GObject mappings for libvirt
 EAPI=5
 HOMEPAGE=http://libvirt.org/git/?p=libvirt-glib.git
 IUSE=+introspection python +vala python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libxml2:2 >=app-emulation/libvirt-1.2.6:= >=dev-libs/glib-2.38.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) 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(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 ) vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://libvirt.org/libvirt/glib/libvirt-glib-0.2.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b9c615f58458c7c226e79f20c4b1d2bb
+_md5_=9e1544c03a95990dd868bf8ae1d3969c
diff --git a/metadata/md5-cache/app-emulation/rkt-1.0.0 b/metadata/md5-cache/app-emulation/rkt-1.0.0
new file mode 100644
index 000000000000..21151ff32124
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/rkt-1.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/go-1.4.1 app-arch/cpio 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 +actool
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!app-emulation/rocket
+REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly )
+SLOT=0
+SRC_URI=https://github.com/coreos/rkt/archive/v1.0.0.tar.gz -> rkt-1.0.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/794.1.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-794.1.0.img )
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=07f877819cd37731a5c1e20fdc2ea579
diff --git a/metadata/md5-cache/app-emulation/vagrant-1.8.1 b/metadata/md5-cache/app-emulation/vagrant-1.8.1
index 43b521f70ecf..190cc9fbe25a 100644
--- a/metadata/md5-cache/app-emulation/vagrant-1.8.1
+++ b/metadata/md5-cache/app-emulation/vagrant-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtu
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.8.1.tar.gz -> vagrant-1.8.1.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fc5c23b6e9cd5093c0c71bac167d5f1e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.28 b/metadata/md5-cache/app-emulation/virtualbox-4.3.28
index 7fd2b82b4cea..c0326f53d26d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.28
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.28
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.28 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.28/VirtualBox-4.3.28.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64fd14a00583dfaf6e8082bb2f1380ec
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.32 b/metadata/md5-cache/app-emulation/virtualbox-4.3.32
index e8a93396d554..63713fba8caa 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.32
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.32 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.32/VirtualBox-4.3.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42c1bce2779a757f1c490c4c6a7cad97
diff --git a/metadata/md5-cache/app-emulation/virtualbox-4.3.34 b/metadata/md5-cache/app-emulation/virtualbox-4.3.34
index 674d1d05db9d..e1bb138b155a 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-4.3.34
+++ b/metadata/md5-cache/app-emulation/virtualbox-4.3.34
@@ -11,5 +11,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-4.3.34 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/4.3.34/VirtualBox-4.3.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-4.3.16-patches-01.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6907f829f116ea73c755583ab95f43dd
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.0.12 b/metadata/md5-cache/app-emulation/virtualbox-5.0.12
index b7666d9abb33..0fb498aab1cf 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.0.12
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.0.12
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.0.12 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/5.0.12/VirtualBox-5.0.12.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.0.2-patches-01.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2dcd488e54410023c23e03b22ee86d35
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.0.14 b/metadata/md5-cache/app-emulation/virtualbox-5.0.14
index bd34db52815d..5caf84c72c7b 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.0.14
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.0.14
@@ -10,5 +10,5 @@ RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.0.14 d
 REQUIRED_USE=java? ( sdk ) python? ( ( sdk ) ) vboxwebsrv? ( java ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://download.virtualbox.org/virtualbox/5.0.14/VirtualBox-5.0.14.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.0.2-patches-01.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4643853841406c6bd94fa7b14e9ab5ae
diff --git a/metadata/md5-cache/app-misc/bfm-1.2-r1 b/metadata/md5-cache/app-misc/bfm-1.2-r1
index 63ba1a7dcac8..4e3db6a4dba6 100644
--- a/metadata/md5-cache/app-misc/bfm-1.2-r1
+++ b/metadata/md5-cache/app-misc/bfm-1.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/sun-java3d-bin-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d3d29b024ad4e8d136a60fbb01a9468
diff --git a/metadata/md5-cache/app-misc/bfm-1.2-r2 b/metadata/md5-cache/app-misc/bfm-1.2-r2
index 671cbeec8914..a69fe47914e5 100644
--- a/metadata/md5-cache/app-misc/bfm-1.2-r2
+++ b/metadata/md5-cache/app-misc/bfm-1.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/sun-java3d-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://bfm.webhop.net/releases/bfm-1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97bcd6795e1df2591f86c347da812c97
diff --git a/metadata/md5-cache/app-misc/bijiben-3.18.2 b/metadata/md5-cache/app-misc/bijiben-3.18.2
index d96525bbb2ee..b57903c2d878 100644
--- a/metadata/md5-cache/app-misc/bijiben-3.18.2
+++ b/metadata/md5-cache/app-misc/bijiben-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Note editor designed to remain simple to use
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Bijiben
 IUSE=zeitgeist
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-misc/tracker-1:= >=dev-libs/glib-2.28:2 dev-libs/libxml2 >=gnome-extra/evolution-data-server-3.13.90:= net-libs/gnome-online-accounts net-libs/webkit-gtk:3 sys-apps/util-linux >=x11-libs/gtk+-3.11.4:3 zeitgeist? ( gnome-extra/zeitgeist )
 SLOT=0
 SRC_URI=mirror://gnome/sources/bijiben/3.18/bijiben-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dd98568c5abd58d29b0a3d4cb770ffc4
+_md5_=8f09323806a033d1e6f2d911296957c7
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.1-r2 b/metadata/md5-cache/app-misc/freemind-1.0.1-r2
index b75cc9cc90c2..856819f6e1a2 100644
--- a/metadata/md5-cache/app-misc/freemind-1.0.1-r2
+++ b/metadata/md5-cache/app-misc/freemind-1.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.8 dev-java/fop:0 ) svg? ( dev-java/batik:1.8 dev-java/fop:0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=450aa756c7da63ca54927930164324e1
diff --git a/metadata/md5-cache/app-misc/geoclue-2.4.1 b/metadata/md5-cache/app-misc/geoclue-2.4.1
index 5b963220b3bc..762b8f4f32a5 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.4.1
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=A geoinformation D-Bus service
 EAPI=5
 HOMEPAGE=http://freedesktop.org/wiki/Software/GeoClue
 IUSE=+introspection +modemmanager zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1 ) zeroconf? ( >=net-dns/avahi-0.6.10 ) !<sci-geosciences/geocode-glib-3.10.0
 SLOT=2.0
 SRC_URI=http://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-2.4.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8b705427a8b888e6abd5897111432e02
+_md5_=b76de23629bcf5979f79ae43ae089308
diff --git a/metadata/md5-cache/app-misc/gnote-3.18.1 b/metadata/md5-cache/app-misc/gnote-3.18.1
index 104d2ffdf859..55da1c37e6b3 100644
--- a/metadata/md5-cache/app-misc/gnote-3.18.1
+++ b/metadata/md5-cache/app-misc/gnote-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Desktop note-taking application
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
 IUSE=debug X
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ FDL-1.1
 RDEPEND=>=app-crypt/libsecret-0.8 >=app-text/gtkspell-3.0:3 >=dev-cpp/glibmm-2.32:2 >=dev-cpp/gtkmm-3.10:3.0 >=dev-libs/boost-1.34 >=dev-libs/glib-2.32:2[dbus] >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=x11-libs/gtk+-3.10:3 X? ( x11-libs/libX11 ) gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnote/3.18/gnote-3.18.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b27732315f8d5ea8770413f30aa38bc4
+_md5_=55556d08e8fcaa396b0475c34de47751
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.11 b/metadata/md5-cache/app-misc/hivex-1.3.11
index f26aa51691fc..85fc134921a3 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.11
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11
@@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b555dde0e3b9be8e335ccc90dfb3465b
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.11-r1 b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
index 83c95d885e1f..4cbd213ebb68 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.11-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/oc
 REQUIRED_USE=python? ( )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=573855e4ce8cefa9a3af7e4a7174da97
diff --git a/metadata/md5-cache/app-misc/jitac-0.3.0 b/metadata/md5-cache/app-misc/jitac-0.3.0
index 8b81fd05935b..816dc551f133 100644
--- a/metadata/md5-cache/app-misc/jitac-0.3.0
+++ b/metadata/md5-cache/app-misc/jitac-0.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/sun-jimi:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.roqe.org/jitac/jitac-0.3.0.src.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18c3ca1f57c2b75cad328f43b4c2dfef
diff --git a/metadata/md5-cache/app-misc/slashtime-0.5.13-r1 b/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
index 8a12dcad4871..e8259faa5877 100644
--- a/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
+++ b/metadata/md5-cache/app-misc/slashtime-0.5.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/java-gnome:4.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://research.operationaldynamics.com/projects/slashtime/dist/slashtime-0.5.13.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=48354fa451676c51aa4ee87164f55e33
diff --git a/metadata/md5-cache/app-misc/tmate-2.2.0 b/metadata/md5-cache/app-misc/tmate-2.2.0
new file mode 100644
index 000000000000..73a68c3c6af2
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmate-2.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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
+DESCRIPTION=Instant terminal sharing
+EAPI=5
+HOMEPAGE=http://tmate.io/
+IUSE=debug static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sys-libs/zlib[static-libs?] dev-libs/openssl[static-libs?] dev-libs/libevent[static-libs?] dev-libs/msgpack[static-libs?] >=net-libs/libssh-0.6.0[static-libs?]
+SLOT=0
+SRC_URI=https://github.com/tmate-io/tmate/archive/2.2.0.tar.gz -> tmate-2.2.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/tmate-2.2.0-upstream-patches-0.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=6f9fcb95c7bda754ac9aa451326c2c4b
diff --git a/metadata/md5-cache/app-misc/tracker-1.6.1 b/metadata/md5-cache/app-misc/tracker-1.6.1
index b7dbcca4de5a..a722d6121ac5 100644
--- a/metadata/md5-cache/app-misc/tracker-1.6.1
+++ b/metadata/md5-cache/app-misc/tracker-1.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=A tagging metadata database, search tool and indexer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 IUSE=cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=nautilus? ( ~gnome-extra/nautilus-tracker-tags-1.6.1 )
 RDEPEND=>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7.16:= >=dev-libs/glib-2.40:2 >=dev-libs/gobject-introspection-0.9.5:= >=dev-libs/icu-4.8.1.1:= || ( >=media-gfx/imagemagick-5.2.1[png,jpeg?] media-gfx/graphicsmagick[imagemagick,png,jpeg?] ) >=media-libs/libpng-1.2:0= >=media-libs/libmediaart-1.9:2.0 >=x11-libs/pango-1:= sys-apps/util-linux cue? ( media-libs/libcue ) eds? ( >=mail-client/evolution-3.3.5:= >=gnome-extra/evolution-data-server-3.3.5:= <mail-client/evolution-3.5.3 <gnome-extra/evolution-data-server-3.5.3 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) gif? ( media-libs/giflib:= ) gsf? ( >=gnome-extra/libgsf-1.14.24 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( >=dev-libs/libgee-0.3:0.8 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) iso? ( >=sys-libs/libosinfo-0.2.9:= ) jpeg? ( virtual/jpeg:0 ) upower? ( || ( >=sys-power/upower-0.9:= sys-power/upower-pm-utils ) ) mp3? ( >=media-libs/taglib-1.6 ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1:= >=app-text/poppler-0.16:=[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( >=dev-libs/totem-pl-parser-3 ) rss? ( >=net-libs/libgrss-0.7:0 ) stemmer? ( dev-libs/snowball-stemmer ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff:0 ) upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) vorbis? ( >=media-libs/libvorbis-0.22 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) xps? ( app-text/libgxps ) !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !
 SLOT=0/100
 SRC_URI=mirror://gnome/sources/tracker/1.6/tracker-1.6.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=042eb0947273c2f286bc71456311eaee
+_md5_=6a7a761c268b9d6f287e0bad065fbfc4
diff --git a/metadata/md5-cache/app-misc/vifm-0.8.1_beta b/metadata/md5-cache/app-misc/vifm-0.8.1a
similarity index 91%
rename from metadata/md5-cache/app-misc/vifm-0.8.1_beta
rename to metadata/md5-cache/app-misc/vifm-0.8.1a
index 08fb9eb5901e..9235251448cd 100644
--- a/metadata/md5-cache/app-misc/vifm-0.8.1_beta
+++ b/metadata/md5-cache/app-misc/vifm-0.8.1a
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~s390 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r99:5 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/vifm/vifm-0.8.1-beta.tar.bz2
+SRC_URI=mirror://sourceforge/vifm/vifm-0.8.1a.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf
-_md5_=37b2ba7188f2f69a73fc47bb7f580ace
+_md5_=1524d3e0ecbfe87e078629f8cca68149
diff --git a/metadata/md5-cache/app-office/borg-1.7.4-r3 b/metadata/md5-cache/app-office/borg-1.7.4-r3
index ade99714824f..644a6b2b9b0f 100644
--- a/metadata/md5-cache/app-office/borg-1.7.4-r3
+++ b/metadata/md5-cache/app-office/borg-1.7.4-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/oracle-javamail:0 >=virtual/jre-1.6 dev-db/hsqldb:0 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/borg-calendar/borg%201.7/BORG%201.7.4/borg_src_1_7_4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49064cec97853c8e1a8507c2d2ead8b6
diff --git a/metadata/md5-cache/app-office/gnucash-2.6.11 b/metadata/md5-cache/app-office/gnucash-2.6.11
index 73c1cd059568..e496a2aa2d96 100644
--- a/metadata/md5-cache/app-office/gnucash-2.6.11
+++ b/metadata/md5-cache/app-office/gnucash-2.6.11
@@ -4,11 +4,11 @@ DESCRIPTION=A personal finance manager
 EAPI=5
 HOMEPAGE=http://www.gnucash.org/
 IUSE=chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=doc? ( >=app-doc/gnucash-docs-2.2.0 )
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 dev-libs/libxslt >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www gnome-base/libgnomecanvas >=net-libs/webkit-gtk-1.2:2 >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.24:2 >=x11-libs/goffice-0.7.0:0.8[gnome] x11-libs/pango gnome-keyring? ( >=app-crypt/libsecret-0.18 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) 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(+)] ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) sqlite? ( >=dev-db/libdbi-0.9.0 >=dev-db/libdbi-drivers-0.9.0[sqlite] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnucash/gnucash-2.6.11.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ac04b513baa42b84f0f384c7866c94f8
+_md5_=88230f3aca8c7ed926b3eff4d09e4cd1
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.27 b/metadata/md5-cache/app-office/gnumeric-1.12.27
index 0b965f9b58c1..1e15499231af 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.27
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.27
@@ -4,7 +4,7 @@ DESCRIPTION=The GNOME Spreadsheet
 EAPI=5
 HOMEPAGE=http://www.gnumeric.org/
 IUSE=+introspection libgda perl python python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.38.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.27:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl ) 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/pygobject-3:3[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(+)] ) libgda? ( gnome-extra/libgda:5[gtk] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.27.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=283bafd4b9911fffa0657f0cdf8aa460
+_md5_=a55f2cd2441c781beb7f5157431688ca
diff --git a/metadata/md5-cache/app-office/hourglass-0.7.2 b/metadata/md5-cache/app-office/hourglass-0.7.2
index ffb023eb1d50..1f43603fb093 100644
--- a/metadata/md5-cache/app-office/hourglass-0.7.2
+++ b/metadata/md5-cache/app-office/hourglass-0.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/log4j dev-java/jcommon:1.0 dev-java/jdom:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hourglass/hourglass-0.7.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c9de7f4491b5f52e5b4120e9481c8a0
diff --git a/metadata/md5-cache/app-office/hourglass-0.7.2-r1 b/metadata/md5-cache/app-office/hourglass-0.7.2-r1
index bacf73554f8d..355f2c31c1a7 100644
--- a/metadata/md5-cache/app-office/hourglass-0.7.2-r1
+++ b/metadata/md5-cache/app-office/hourglass-0.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/log4j dev-java/jcommon:1.0 dev-java/jdom:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hourglass/hourglass-0.7.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e68a71fda2fbd37a0420da2cf84641d6
diff --git a/metadata/md5-cache/app-office/ledger-3.1 b/metadata/md5-cache/app-office/ledger-3.1
deleted file mode 100644
index 783c3f0d05dc..000000000000
--- a/metadata/md5-cache/app-office/ledger-3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-libs/gmp:0 dev-libs/mpfr:0 dev-libs/utfcpp sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=A double-entry accounting system with a command-line reporting interface
-EAPI=5
-HOMEPAGE=http://ledger-cli.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-libs/gmp:0 dev-libs/mpfr:0
-SLOT=0
-SRC_URI=https://github.com/ledger/ledger/archive/v3.1.tar.gz -> ledger-3.1.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7e59d7c0ce28619c1a456351c4b91f17
diff --git a/metadata/md5-cache/app-office/ledger-3.1-r1 b/metadata/md5-cache/app-office/ledger-3.1-r1
index 1b126d885344..3a9da9921475 100644
--- a/metadata/md5-cache/app-office/ledger-3.1-r1
+++ b/metadata/md5-cache/app-office/ledger-3.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/boost:= dev-libs/gmp:0 dev-libs/mpfr:0 emacs? ( virtual/emacs ) dev-libs/utfcpp doc? ( sys-apps/texinfo ) sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=<dev-libs/boost-1.58:= dev-libs/gmp:0 dev-libs/mpfr:0 emacs? ( virtual/emacs ) dev-libs/utfcpp doc? ( sys-apps/texinfo ) sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=A double-entry accounting system with a command-line reporting interface
 EAPI=5
 HOMEPAGE=http://ledger-cli.org/
 IUSE=doc emacs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-libs/gmp:0 dev-libs/mpfr:0 emacs? ( virtual/emacs )
+RDEPEND=<dev-libs/boost-1.58:= dev-libs/gmp:0 dev-libs/mpfr:0 emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.1.tar.gz -> ledger-3.1.tar.gz
 _eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e72119b5daefe3118fd37428ef6c16f6
+_md5_=53a30d45dcecceae9535502520236e33
diff --git a/metadata/md5-cache/app-office/ledger-3.1.1 b/metadata/md5-cache/app-office/ledger-3.1.1
new file mode 100644
index 000000000000..851da8ebba8c
--- /dev/null
+++ b/metadata/md5-cache/app-office/ledger-3.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=dev-libs/gmp:0 dev-libs/mpfr:0 emacs? ( virtual/emacs ) python? ( dev-libs/boost:=[python] ) !python? ( dev-libs/boost:= ) dev-libs/utfcpp doc? ( sys-apps/texinfo ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=A double-entry accounting system with a command-line reporting interface
+EAPI=5
+HOMEPAGE=http://ledger-cli.org/
+IUSE=doc emacs python python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/gmp:0 dev-libs/mpfr:0 emacs? ( virtual/emacs ) python? ( dev-libs/boost:=[python] ) !python? ( dev-libs/boost:= ) python? ( dev-python/cheetah )
+SLOT=0
+SRC_URI=https://github.com/ledger/ledger/archive/v3.1.1.tar.gz -> ledger-3.1.1.tar.gz
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6ca5d7c42d8e54591bf34a0c9ba471c1
diff --git a/metadata/md5-cache/app-office/libreoffice-4.4.6.3 b/metadata/md5-cache/app-office/libreoffice-4.4.6.3
index 564616952b83..5d0dd196864f 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.4.6.3
+++ b/metadata/md5-cache/app-office/libreoffice-4.4.6.3
@@ -1,5 +1,5 @@
 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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] 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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.1 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.4 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 =app-text/libwps-0.3* >=app-text/poppler-0.16:=[xpdf-headers(+),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.7* >=dev-libs/librevenge-0.0.1 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d:0 >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2: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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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.11.2:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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=] )
+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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] 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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.1 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.4 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 =app-text/libwps-0.3* >=app-text/poppler-0.16:=[xpdf-headers(+),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.7* >=dev-libs/librevenge-0.0.1 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d:0 >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2: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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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.11.2:0= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) 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-4.4.6.3.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-4.4.6.3.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.6//libreoffice-4.4.6.3.tar.xz http://download.documentfoundation.org/libreoffice/src/4.4.6//libreoffice-help-4.4.6.3.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.6.3//libreoffice-4.4.6.3.tar.xz http://download.documentfoundation.org/libreoffice/old/4.4.6.3//libreoffice-help-4.4.6.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	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c1ec921afc96821a4d97cc97bf36cd75
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=9e2e21becd5a19ff46ddbd4a3beea475
diff --git a/metadata/md5-cache/app-office/libreoffice-4.4.9999 b/metadata/md5-cache/app-office/libreoffice-4.4.9999
index ea749898c37b..460e3d0c0284 100644
--- a/metadata/md5-cache/app-office/libreoffice-4.4.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.4.9999
@@ -1,5 +1,5 @@
 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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] 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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.1 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.4 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 =app-text/libwps-0.3* >=app-text/poppler-0.16:=[xpdf-headers(+),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.7* >=dev-libs/librevenge-0.0.1 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d:0 >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2: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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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.11.2:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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 >=dev-vcs/git-1.8.2.1 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=] )
+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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] 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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.1 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.4 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 =app-text/libwps-0.3* >=app-text/poppler-0.16:=[xpdf-headers(+),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.7* >=dev-libs/librevenge-0.0.1 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d:0 >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2: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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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.11.2:0= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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 >=dev-vcs/git-1.8.2.1 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
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) bluetooth? ( dbus ) collada? ( gltf ) gnome? ( gtk ) eds? ( gnome ) 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//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	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c1ec921afc96821a4d97cc97bf36cd75
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=9e2e21becd5a19ff46ddbd4a3beea475
diff --git a/metadata/md5-cache/app-office/libreoffice-5.0.3.2 b/metadata/md5-cache/app-office/libreoffice-5.0.3.2
index f5b8c731fa57..76a5b5bb254c 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-5.0.3.2
@@ -1,5 +1,5 @@
 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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.5 >=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:=[xpdf-headers(+),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.7* >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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=] )
+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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.5 >=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:=[xpdf-headers(+),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.7* >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) gnome? ( gtk ) eds? ( gnome ) 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.0.3.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.0.3.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.0.3//libreoffice-5.0.3.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.0.3//libreoffice-help-5.0.3.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.0.3.2//libreoffice-5.0.3.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.0.3.2//libreoffice-help-5.0.3.2.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	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6388d0ab247db68c3f12d9638e63d46c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5faf841802adc299ca8f88f0817cc691
diff --git a/metadata/md5-cache/app-office/libreoffice-5.0.4.2 b/metadata/md5-cache/app-office/libreoffice-5.0.4.2
index c98c608e0732..20c5c0b798a5 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.0.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-5.0.4.2
@@ -1,5 +1,5 @@
 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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.5 >=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.7* >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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=] )
+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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.5 >=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.7* >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) gnome? ( gtk ) eds? ( gnome ) 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.0.4.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.0.4.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.0.4//libreoffice-5.0.4.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.0.4//libreoffice-help-5.0.4.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.0.4.2//libreoffice-5.0.4.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.0.4.2//libreoffice-help-5.0.4.2.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	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=10c53dc6d41d96fa93a0686b9ec96854
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a827126a05b2213c78d5a1b78e0053cf
diff --git a/metadata/md5-cache/app-office/libreoffice-5.0.5.2 b/metadata/md5-cache/app-office/libreoffice-5.0.5.2
index fa3bb38711cd..6130c50087ed 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.0.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-5.0.5.2
@@ -1,5 +1,5 @@
 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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.5 >=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.7* >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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=] )
+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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.5 >=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.7* >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) gnome? ( gtk ) eds? ( gnome ) 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.0.5.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.0.5.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.0.5//libreoffice-5.0.5.2.tar.xz http://download.documentfoundation.org/libreoffice/src/5.0.5//libreoffice-help-5.0.5.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.0.5.2//libreoffice-5.0.5.2.tar.xz http://download.documentfoundation.org/libreoffice/old/5.0.5.2//libreoffice-help-5.0.5.2.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	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=10c53dc6d41d96fa93a0686b9ec96854
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=181db7d42ac5ab41bb90ba58ab21faac
diff --git a/metadata/md5-cache/app-office/libreoffice-5.0.9999 b/metadata/md5-cache/app-office/libreoffice-5.0.9999
index cc1145b3cb5c..0b1ccad48f62 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-5.0.9999
@@ -1,5 +1,5 @@
 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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.5 >=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.7* >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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 >=dev-vcs/git-1.8.2.1 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=] )
+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.2 >=app-text/libebook-0.1.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.5 >=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.7* >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=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 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) >=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-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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 >=dev-vcs/git-1.8.2.1 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
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads
 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 ) gnome? ( gtk ) eds? ( gnome ) 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//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	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=10c53dc6d41d96fa93a0686b9ec96854
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=181db7d42ac5ab41bb90ba58ab21faac
diff --git a/metadata/md5-cache/app-office/libreoffice-5.1.0.3 b/metadata/md5-cache/app-office/libreoffice-5.1.0.3
new file mode 100644
index 000000000000..e7c13f890476
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-5.1.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),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] 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-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-5.1*
+RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),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] 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_python3_4 python_single_target_python3_5 ) 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.0.3.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.1.0.3.tar.xz http://download.documentfoundation.org/libreoffice/src/5.1.0//libreoffice-5.1.0.3.tar.xz http://download.documentfoundation.org/libreoffice/src/5.1.0//libreoffice-help-5.1.0.3.tar.xz http://download.documentfoundation.org/libreoffice/old/5.1.0.3//libreoffice-5.1.0.3.tar.xz http://download.documentfoundation.org/libreoffice/old/5.1.0.3//libreoffice-help-5.1.0.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	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=d0d274b1e7c92d3eb699a88c77d22055
diff --git a/metadata/md5-cache/app-office/libreoffice-5.1.9999 b/metadata/md5-cache/app-office/libreoffice-5.1.9999
new file mode 100644
index 000000000000..4d43b5534206
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-5.1.9999
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),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] 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-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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 >=dev-vcs/git-1.8.2.1 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_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND=!app-office/libreoffice-l10n
+RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),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] 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_python3_4 python_single_target_python3_5 ) 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//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	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=3340e9feb946a909ac320db1e2470b21
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index f1019c93e018..84568ca3430b 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),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.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.6 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4.2 >=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.0 >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( dev-libs/glib:2 ) 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:= media-libs/glm net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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 >=dev-vcs/git-1.8.2.1 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=] )
+DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),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.0 >=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] 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:1= media-libs/glm >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils 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 >=dev-vcs/git-1.8.2.1 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_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
-RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),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.1 >=app-text/libetonyek-0.1.2 app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.6 >=app-text/libodfgen-0.1.0 app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4.2 >=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.0 >=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] 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? ( gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-2.5 ) gltf? ( media-libs/libgltf ) gnome? ( dev-libs/glib:2 ) 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_python3_4 python_single_target_python3_5 ) 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? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),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.0 >=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] 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_python3_4 python_single_target_python3_5 ) 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//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	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a0cbef4fcfe783391972582e70bb5c45
+SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) 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	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=94df3b3d1af8884e800a414196a4515a
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.0.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-5.0.3.2
index 86bf86ade8bd..b35b2d11e3ef 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-5.0.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.0.3.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.0.3.2.xd3 ) ) ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=3f9fe195c71b16b2e5520b05f8ed02bd
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-5.1.0.3 b/metadata/md5-cache/app-office/libreoffice-l10n-5.1.0.3
new file mode 100644
index 000000000000..dc4775339551
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-5.1.0.3
@@ -0,0 +1,14 @@
+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.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_am.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_am.tar.gz ) ) linguas_ast? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ast.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ast.tar.gz ) ) linguas_bg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bg.tar.gz ) ) linguas_bn_IN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) linguas_bn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bn.tar.gz ) ) linguas_bo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bo.tar.gz ) ) linguas_bs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_bs.tar.gz ) ) linguas_ca_valencia? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) linguas_ca? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ca.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ca.tar.gz ) ) linguas_cs? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_cs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_cs.tar.gz ) ) linguas_da? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_da.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_da.tar.gz ) ) linguas_de? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_de.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_de.tar.gz ) ) linguas_dz? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_dz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_dz.tar.gz ) ) linguas_el? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_el.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_el.tar.gz ) ) linguas_en_GB? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) linguas_en? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-US.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-US.tar.gz ) ) linguas_en_ZA? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) linguas_eo? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_eo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_eo.tar.gz ) ) linguas_es? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_es.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_es.tar.gz ) ) linguas_et? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_et.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_et.tar.gz ) ) linguas_eu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_eu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_eu.tar.gz ) ) linguas_fi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_fi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_fi.tar.gz ) ) linguas_fr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_fr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_fr.tar.gz ) ) linguas_gl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_gl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_gl.tar.gz ) ) linguas_gu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_gu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_gu.tar.gz ) ) linguas_he? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_he.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_he.tar.gz ) ) linguas_hi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hi.tar.gz ) ) linguas_hr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hr.tar.gz ) ) linguas_hu? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_hu.tar.gz ) ) linguas_id? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_id.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_id.tar.gz ) ) linguas_is? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_is.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_is.tar.gz ) ) linguas_it? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_it.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_it.tar.gz ) ) linguas_ja? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ja.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ja.tar.gz ) ) linguas_ka? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ka.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ka.tar.gz ) ) linguas_km? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_km.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_km.tar.gz ) ) linguas_ko? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ko.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ko.tar.gz ) ) linguas_mk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_mk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_mk.tar.gz ) ) linguas_nb? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nb.tar.gz ) ) linguas_ne? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ne.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ne.tar.gz ) ) linguas_nl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nl.tar.gz ) ) linguas_nn? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_nn.tar.gz ) ) linguas_om? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_om.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_om.tar.gz ) ) linguas_pl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pl.tar.gz ) ) linguas_pt_BR? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) linguas_pt? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_pt.tar.gz ) ) linguas_ru? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ru.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ru.tar.gz ) ) linguas_si? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_si.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_si.tar.gz ) ) linguas_sk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sk.tar.gz ) ) linguas_sl? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sl.tar.gz ) ) linguas_sq? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sq.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sq.tar.gz ) ) linguas_sv? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_sv.tar.gz ) ) linguas_tg? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_tg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_tg.tar.gz ) ) linguas_tr? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_tr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_tr.tar.gz ) ) linguas_ug? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_ug.tar.gz ) ) linguas_uk? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_uk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_uk.tar.gz ) ) linguas_vi? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_vi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_vi.tar.gz ) ) linguas_zh_CN? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) linguas_zh_TW? ( offlinehelp? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) linguas_am? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_am.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_am.tar.gz ) linguas_ast? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ast.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ast.tar.gz ) linguas_bg? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bg.tar.gz ) linguas_bn_IN? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz ) linguas_bn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bn.tar.gz ) linguas_bo? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bo.tar.gz ) linguas_bs? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_bs.tar.gz ) linguas_ca_valencia? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) linguas_ca? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ca.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ca.tar.gz ) linguas_cs? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_cs.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_cs.tar.gz ) linguas_da? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_da.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_da.tar.gz ) linguas_de? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_de.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_de.tar.gz ) linguas_dz? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_dz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_dz.tar.gz ) linguas_el? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_el.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_el.tar.gz ) linguas_en_GB? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz ) linguas_en_ZA? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz ) linguas_eo? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_eo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_eo.tar.gz ) linguas_es? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_es.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_es.tar.gz ) linguas_et? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_et.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_et.tar.gz ) linguas_eu? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_eu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_eu.tar.gz ) linguas_fi? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fi.tar.gz ) linguas_fr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fr.tar.gz ) linguas_gl? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gl.tar.gz ) linguas_gu? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gu.tar.gz ) linguas_he? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_he.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_he.tar.gz ) linguas_hi? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hi.tar.gz ) linguas_hr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hr.tar.gz ) linguas_hu? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_hu.tar.gz ) linguas_id? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_id.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_id.tar.gz ) linguas_is? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_is.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_is.tar.gz ) linguas_it? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_it.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_it.tar.gz ) linguas_ja? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ja.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ja.tar.gz ) linguas_ka? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ka.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ka.tar.gz ) linguas_km? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_km.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_km.tar.gz ) linguas_ko? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ko.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ko.tar.gz ) linguas_mk? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mk.tar.gz ) linguas_nb? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nb.tar.gz ) linguas_ne? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ne.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ne.tar.gz ) linguas_nl? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nl.tar.gz ) linguas_nn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nn.tar.gz ) linguas_om? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_om.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_om.tar.gz ) linguas_pl? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pl.tar.gz ) linguas_pt_BR? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz ) linguas_pt? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pt.tar.gz ) linguas_ru? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ru.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ru.tar.gz ) linguas_si? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_si.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_si.tar.gz ) linguas_sk? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sk.tar.gz ) linguas_sl? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sl.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sl.tar.gz ) linguas_sq? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sq.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sq.tar.gz ) linguas_sv? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sv.tar.gz ) linguas_tg? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tg.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tg.tar.gz ) linguas_tr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tr.tar.gz ) linguas_ug? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ug.tar.gz ) linguas_uk? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_uk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_uk.tar.gz ) linguas_vi? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_vi.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_vi.tar.gz ) linguas_zh_CN? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz ) linguas_zh_TW? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz ) linguas_af? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_af.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_af.tar.gz ) linguas_ar? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ar.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ar.tar.gz ) linguas_as? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_as.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_as.tar.gz ) linguas_be? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_be.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_be.tar.gz ) linguas_br? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_br.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_br.tar.gz ) linguas_brx? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_brx.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_brx.tar.gz ) linguas_cy? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_cy.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_cy.tar.gz ) linguas_dgo? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_dgo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_dgo.tar.gz ) linguas_fa? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fa.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_fa.tar.gz ) linguas_ga? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ga.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ga.tar.gz ) linguas_gd? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gd.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gd.tar.gz ) linguas_gug? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gug.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_gug.tar.gz ) linguas_kk? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kk.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kk.tar.gz ) linguas_kmr_Latn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) linguas_kn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kn.tar.gz ) linguas_kok? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kok.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_kok.tar.gz ) linguas_ks? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ks.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ks.tar.gz ) linguas_lb? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lb.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lb.tar.gz ) linguas_lo? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lo.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lo.tar.gz ) linguas_lt? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lt.tar.gz ) linguas_lv? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lv.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_lv.tar.gz ) linguas_mai? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mai.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mai.tar.gz ) linguas_ml? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ml.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ml.tar.gz ) linguas_mn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mn.tar.gz ) linguas_mni? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mni.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mni.tar.gz ) linguas_mr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_mr.tar.gz ) linguas_my? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_my.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_my.tar.gz ) linguas_nr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nr.tar.gz ) linguas_nso? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nso.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_nso.tar.gz ) linguas_oc? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_oc.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_oc.tar.gz ) linguas_or? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_or.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_or.tar.gz ) linguas_pa_IN? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz ) linguas_ro? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ro.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ro.tar.gz ) linguas_rw? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_rw.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_rw.tar.gz ) linguas_sa_IN? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz ) linguas_sat? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sat.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sat.tar.gz ) linguas_sd? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sd.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sd.tar.gz ) linguas_sid? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sid.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sid.tar.gz ) linguas_sr_Latn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) linguas_sr? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sr.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sr.tar.gz ) linguas_ss? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ss.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ss.tar.gz ) linguas_st? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_st.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_st.tar.gz ) linguas_sw_TZ? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) linguas_ta? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ta.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ta.tar.gz ) linguas_te? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_te.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_te.tar.gz ) linguas_th? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_th.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_th.tar.gz ) linguas_tn? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tn.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tn.tar.gz ) linguas_ts? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ts.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ts.tar.gz ) linguas_tt? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tt.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_tt.tar.gz ) linguas_uz? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_uz.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_uz.tar.gz ) linguas_ve? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ve.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_ve.tar.gz ) linguas_xh? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_xh.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_xh.tar.gz ) linguas_zu? ( http://download.documentfoundation.org/libreoffice/stable/5.1.0/rpm/x86/LibreOffice_5.1.0_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zu.tar.gz http://download.documentfoundation.org/libreoffice/testing/5.1.0/rpm/x86/LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zu.tar.gz )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	rpm	3e120fdd74b358f9fb42b825a6558f61	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=797c64138ba8183f8c81aa5766b5d167
diff --git a/metadata/md5-cache/app-office/pinpoint-0.1.8 b/metadata/md5-cache/app-office/pinpoint-0.1.8
index 8137b31a761d..9e964655ede3 100644
--- a/metadata/md5-cache/app-office/pinpoint-0.1.8
+++ b/metadata/md5-cache/app-office/pinpoint-0.1.8
@@ -4,10 +4,10 @@ DESCRIPTION=A tool for making hackers do excellent presentations
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Pinpoint
 IUSE=+gstreamer +pdf
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/clutter-1.23.7:1.0 >=media-libs/clutter-gtk-1.6:1.0 >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.4 x11-libs/pango x11-libs/gdk-pixbuf:2 gstreamer? ( media-libs/clutter-gst:3.0 ) pdf? ( gnome-base/librsvg:2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pinpoint/0.1/pinpoint-0.1.8.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b306d59113ca0f88079a96a9e0db9a40
+_md5_=02c3281ee9ff13ea19dd888db92d9908
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.42 b/metadata/md5-cache/app-officeext/ooofbtools-2.42
new file mode 100644
index 000000000000..a65c39fa33d5
--- /dev/null
+++ b/metadata/md5-cache/app-officeext/ooofbtools-2.42
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm unpack
+DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) ) app-arch/unzip
+DESCRIPTION=Extension for converting and processing eBooks in FictionBook2 format with validator
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/fbtools/
+IUSE=office_implementation_libreoffice office_implementation_openoffice
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libxml2 office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( || ( app-office/openoffice app-office/openoffice-bin ) )
+REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
+SLOT=0
+SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.42.zip
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	office-ext-r1	60f5f222dd37820c823e1451bbd621cf	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ea9748241a8257c75f985f3dd477aee5
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
index c1a8dcbfd950..2fe6d6dbfb57 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( ne
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f02eeb7706de15888e4f09af1518dbc
diff --git a/metadata/md5-cache/app-portage/grs-0.5 b/metadata/md5-cache/app-portage/grs-0.5
new file mode 100644
index 000000000000..cad16b00034b
--- /dev/null
+++ b/metadata/md5-cache/app-portage/grs-0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+DESCRIPTION=Suite to build Gentoo Reference Systems
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~blueness/grs
+IUSE=python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-apps/portage sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.5.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e8109ca2e0ec9623f139158f42482028
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index 032fc8431878..5428947e58eb 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare test unpack
+DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-vcs/git
 DESCRIPTION=Suite to build Gentoo Reference Systems
 EAPI=5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-apps/portage sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 )
 SLOT=0
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=44a37ea1890699bd6b0f3b161a12683d
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e8109ca2e0ec9623f139158f42482028
diff --git a/metadata/md5-cache/app-portage/metagen-0.6.4.2 b/metadata/md5-cache/app-portage/metagen-0.6.4.2
new file mode 100644
index 000000000000..ff36dcb039d1
--- /dev/null
+++ b/metadata/md5-cache/app-portage/metagen-0.6.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_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=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.4.2.tar.bz2
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=341553d6077729b707251b19491453d3
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.62 b/metadata/md5-cache/app-portage/portage-utils-0.62
new file mode 100644
index 000000000000..b0082f407074
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portage-utils-0.62
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] )
+DESCRIPTION=small and fast portage helper tools written in C
+EAPI=4
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/iniparser:0
+SLOT=0
+SRC_URI=mirror://gentoo/portage-utils-0.62.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.62.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=d750301c94ecbf3bef8c5aa5ed4d6df5
diff --git a/metadata/md5-cache/app-text/blogc-0.7.4 b/metadata/md5-cache/app-text/blogc-0.7.5
similarity index 81%
rename from metadata/md5-cache/app-text/blogc-0.7.4
rename to metadata/md5-cache/app-text/blogc-0.7.5
index 29a5b5afef2f..c1f0728fb4c8 100644
--- a/metadata/md5-cache/app-text/blogc-0.7.4
+++ b/metadata/md5-cache/app-text/blogc-0.7.5
@@ -7,6 +7,6 @@ IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
-SRC_URI=https://github.com/blogc/blogc/releases/download/v0.7.4/blogc-0.7.4.tar.xz
+SRC_URI=https://github.com/blogc/blogc/releases/download/v0.7.5/blogc-0.7.5.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=c34307cdb4d9c4ca961faca4f4726aa1
diff --git a/metadata/md5-cache/app-text/evince-3.18.2 b/metadata/md5-cache/app-text/evince-3.18.2
index c9ba5922be69..31d265b6f2cd 100644
--- a/metadata/md5-cache/app-text/evince-3.18.2
+++ b/metadata/md5-cache/app-text/evince-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Simple document viewer for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evince
 IUSE=djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.24[cairo] djvu? ( >=app-text/djvu-3.5.17:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 ( >=x11-themes/gnome-icon-theme-2.17.1 x11-themes/gnome-icon-theme-symbolic ) >=x11-themes/hicolor-icon-theme-0.10 )
 SLOT=0/evd3.4-evv3.3
 SRC_URI=mirror://gnome/sources/evince/3.18/evince-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d7880b8bbf80a7f04d31e6c1a49ffbc5
+_md5_=2e759b5059728c42a6218ae6ae971a67
diff --git a/metadata/md5-cache/app-text/glark-1.10.5 b/metadata/md5-cache/app-text/glark-1.10.5
index 59282a11f1e9..15d28bda7bfd 100644
--- a/metadata/md5-cache/app-text/glark-1.10.5
+++ b/metadata/md5-cache/app-text/glark-1.10.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/jpace/glark/archive/v1.10.5.tar.gz -> glark-git-1.10.5.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=88b2d7aac1c31bd21939fa643cd833b3
diff --git a/metadata/md5-cache/app-text/glark-1.10.5-r1 b/metadata/md5-cache/app-text/glark-1.10.5-r1
index 36cbdd05cf5b..da3b82889e1a 100644
--- a/metadata/md5-cache/app-text/glark-1.10.5-r1
+++ b/metadata/md5-cache/app-text/glark-1.10.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jpace/glark/archive/v1.10.5.tar.gz -> glark-git-1.10.5.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b9d30f05a84ab6ea84619259bed1267e
diff --git a/metadata/md5-cache/app-text/gspell-0.1.2 b/metadata/md5-cache/app-text/gspell-0.1.2
index 9929fbe3e746..ea92f6f31512 100644
--- a/metadata/md5-cache/app-text/gspell-0.1.2
+++ b/metadata/md5-cache/app-text/gspell-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Spell check library for GTK+ applications
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/gspell
 IUSE=+introspection vala
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-text/enchant-1.6.0 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.44:2 >=dev-libs/libxml2-2.5.0:2 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/gtksourceview-3.16:3.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gspell/0.1/gspell-0.1.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c5ae2e8d9b669eb1300d47a97355b30c
+_md5_=a226f527f36a218931dc29d5ff8bf87e
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.7 b/metadata/md5-cache/app-text/gtkspell-3.0.7
index deb046f0792c..4b929abb18b4 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.7
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.7
@@ -4,10 +4,10 @@ DESCRIPTION=Spell checking widget for GTK
 EAPI=5
 HOMEPAGE=http://gtkspell.sourceforge.net/
 IUSE=+introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 SLOT=3/0
 SRC_URI=mirror://sourceforge/project/gtkspell/3.0.7/gtkspell3-3.0.7.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c2929ca87725c8d1d4d8cd530c72f610
+_md5_=304eee952f28f7787b033521fd78c8ed
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13 b/metadata/md5-cache/app-text/hyperestraier-1.4.13
index aa645c691bf9..b0401b3b4f37 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/qdbm-1.8.75 sys-libs/zlib java? ( >=virtual/jre-1.4 ) mecab? ( app-text/mecab ) ruby? ( dev-lang/ruby ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96434bf3579799779db6bea518e7ea58
diff --git a/metadata/md5-cache/app-text/iso-codes-3.65 b/metadata/md5-cache/app-text/iso-codes-3.65
index d048cdd071a9..f47de3a04078 100644
--- a/metadata/md5-cache/app-text/iso-codes-3.65
+++ b/metadata/md5-cache/app-text/iso-codes-3.65
@@ -4,10 +4,10 @@ DESCRIPTION=ISO language, territory, currency, script codes and their translatio
 EAPI=5
 HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
 IUSE=linguas_af linguas_am linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_bg linguas_bn linguas_bn_IN linguas_br linguas_bs linguas_byn linguas_ca linguas_crh linguas_cs linguas_cy linguas_da linguas_de linguas_dz linguas_el linguas_en linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_ga linguas_gez linguas_gl linguas_gu linguas_haw linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_kok linguas_ku linguas_lt linguas_lv linguas_mi linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_mt linguas_nb linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_or linguas_pa linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_so linguas_sq linguas_sr linguas_sr@latin linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_ti linguas_tig linguas_tk linguas_tl linguas_tr linguas_tt linguas_tt@iqtelif linguas_ug linguas_uk linguas_ve linguas_vi linguas_wa linguas_wal linguas_wo linguas_xh linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.65.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b9c82d0fb2f2987ead8c605a835372f2
+_md5_=afee599a287e1f94c57111dd5d4b99ea
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r2 b/metadata/md5-cache/app-text/jabref-2.10-r2
index 3883f8e2875a..ec99a238f811 100644
--- a/metadata/md5-cache/app-text/jabref-2.10-r2
+++ b/metadata/md5-cache/app-text/jabref-2.10-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cce371e20b120f1c76e58419134fa059
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r4 b/metadata/md5-cache/app-text/jabref-2.10-r4
index 518d46d3fc10..ebe53636d4a5 100644
--- a/metadata/md5-cache/app-text/jabref-2.10-r4
+++ b/metadata/md5-cache/app-text/jabref-2.10-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/antlr:0 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5a8e8ab21f5474d4f43604cf2c6f0091
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.10 b/metadata/md5-cache/app-text/jabref-bin-2.10
index 542739b73ecc..abdfc085d208 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.10
+++ b/metadata/md5-cache/app-text/jabref-bin-2.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.10.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b069b8b26e874f8539053c5ddd5ed32
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.11 b/metadata/md5-cache/app-text/jabref-bin-2.11
index 3191b572933a..bef7b02c6252 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.11
+++ b/metadata/md5-cache/app-text/jabref-bin-2.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.11.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14c77d71e80cc0a801d804f08bb7a56e
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.11.1 b/metadata/md5-cache/app-text/jabref-bin-2.11.1
index 75051e1e0c52..c2191f83b4c7 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.11.1
+++ b/metadata/md5-cache/app-text/jabref-bin-2.11.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.11.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14c77d71e80cc0a801d804f08bb7a56e
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2 b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2
index 2e4d0fa46c80..06d95878e4f6 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2
+++ b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.11b2.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14ad28f25273a8b2679421d86871989d
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc3 b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc3
index 4e4f43f10a43..6369709d9dd8 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc3
+++ b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.11b3.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14ad28f25273a8b2679421d86871989d
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc3-r1 b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc3-r1
index c6e6994990a8..f9c080891bb5 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc3-r1
+++ b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.11b3.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=845255eb23828275a38c0c833bfe434e
diff --git a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc4 b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc4
index 732e27f0c25c..0ba2ed7cf5b0 100644
--- a/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc4
+++ b/metadata/md5-cache/app-text/jabref-bin-2.11_beta_rc4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-2.11b4.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=845255eb23828275a38c0c833bfe434e
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.1 b/metadata/md5-cache/app-text/jabref-bin-3.1
index 6aa6232963ac..7ce1f699b8f8 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.1
+++ b/metadata/md5-cache/app-text/jabref-bin-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-3.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2314b43d5f9ff3d51fd0403176b659ff
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.2 b/metadata/md5-cache/app-text/jabref-bin-3.2
index 66018bd08c7c..879015b6b206 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.2
+++ b/metadata/md5-cache/app-text/jabref-bin-3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jabref/JabRef-3.2.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c3d1ef20791dafcb9dc89ff3395c157
diff --git a/metadata/md5-cache/app-text/jist-1.5.1 b/metadata/md5-cache/app-text/jist-1.5.1
index a9eaabdb60e5..1e1cb27e08ec 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1
+++ b/metadata/md5-cache/app-text/jist-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/jist-1.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=536fe034cda5379acedfdf7224bf2300
diff --git a/metadata/md5-cache/app-text/jmupdf-0.3.0 b/metadata/md5-cache/app-text/jmupdf-0.3.0
index 51ee21a732fe..31391f98b182 100644
--- a/metadata/md5-cache/app-text/jmupdf-0.3.0
+++ b/metadata/md5-cache/app-text/jmupdf-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=system-mupdf? ( >=app-text/mupdf-1.2 ) virtual/jdk:1.7 >=dev-java/java-c
 REQUIRED_USE=!system-mupdf
 SLOT=0
 SRC_URI=https://jmupdf.googlecode.com/files/2012-01-24-src-jmupdf-0.3.0.7z
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f60f274017590e012ff9f86d01b8b92d
diff --git a/metadata/md5-cache/app-text/jmupdf-0.4.1 b/metadata/md5-cache/app-text/jmupdf-0.4.1
index 27432b859020..5dbb6e8c4fd5 100644
--- a/metadata/md5-cache/app-text/jmupdf-0.4.1
+++ b/metadata/md5-cache/app-text/jmupdf-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=system-mupdf? ( >=app-text/mupdf-1.2 ) virtual/jdk:1.7 >=dev-java/java-c
 REQUIRED_USE=!system-mupdf
 SLOT=0
 SRC_URI=https://jmupdf.googlecode.com/files/2012-02-23-source-jmupdf-0.4.1.7z
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2f02798b9e2d95c8f9d4e438321e25e
diff --git a/metadata/md5-cache/app-text/jmupdf-0.4.1-r1 b/metadata/md5-cache/app-text/jmupdf-0.4.1-r1
index 303524e089ee..bfd547efb3b1 100644
--- a/metadata/md5-cache/app-text/jmupdf-0.4.1-r1
+++ b/metadata/md5-cache/app-text/jmupdf-0.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/freetype:2 media-libs/openjpeg:0= system-mupdf? ( >=app-text/
 REQUIRED_USE=!system-mupdf
 SLOT=0
 SRC_URI=https://jmupdf.googlecode.com/files/2012-02-23-source-jmupdf-0.4.1.7z
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6288c6fc9a238f85aee11b338af70d36
diff --git a/metadata/md5-cache/app-text/jmupdf-9999 b/metadata/md5-cache/app-text/jmupdf-9999
index 8cfe20254cce..8437cb29d0a4 100644
--- a/metadata/md5-cache/app-text/jmupdf-9999
+++ b/metadata/md5-cache/app-text/jmupdf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-1
 RDEPEND=system-mupdf? ( >=app-text/mupdf-1.2 ) virtual/jdk:1.7 >=dev-java/java-config-2.2.0
 REQUIRED_USE=!system-mupdf
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-2	df00117322129fb906bb0a53c3d6a020	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-2	df00117322129fb906bb0a53c3d6a020	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eedc92a16f2c9bfd96127c0d47665633
diff --git a/metadata/md5-cache/app-text/jpdftweak-0.9-r1 b/metadata/md5-cache/app-text/jpdftweak-0.9-r1
index a265f1486b38..e5b92ba1f110 100644
--- a/metadata/md5-cache/app-text/jpdftweak-0.9-r1
+++ b/metadata/md5-cache/app-text/jpdftweak-0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/itext:0 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jpdftweak/jpdftweak-src-0.9.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6fdeeac6fffb3e51ecdeb71df8f973dc
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.3 b/metadata/md5-cache/app-text/libetonyek-0.1.3
index a3a302263c9e..56db042b943f 100644
--- a/metadata/md5-cache/app-text/libetonyek-0.1.3
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.3
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 >=dev-util/mdds-0.12.1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DEFINED_PHASES=compile configure install prepare pretend unpack
+DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 >=dev-util/mdds-0.12.1:0 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=Library parsing Apple Keynote presentations
 EAPI=5
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.3.tar.xz
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=32bd9059cd59ee185aa10190883e1787
+_md5_=b6658849df9cebd85de8cab2f8a60bbe
diff --git a/metadata/md5-cache/app-text/libetonyek-0.1.6 b/metadata/md5-cache/app-text/libetonyek-0.1.6
new file mode 100644
index 000000000000..294bdf63fdcf
--- /dev/null
+++ b/metadata/md5-cache/app-text/libetonyek-0.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost dev-util/mdds:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DESCRIPTION=Library parsing Apple Keynote presentations
+EAPI=6
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
+IUSE=doc static-libs test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
+RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+SLOT=0
+SRC_URI=http://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.6.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=c0ff3fda065e2ee916c9eb3fef70a48d
diff --git a/metadata/md5-cache/app-text/libetonyek-9999 b/metadata/md5-cache/app-text/libetonyek-9999
index 6c56a9f87932..26eb564450f9 100644
--- a/metadata/md5-cache/app-text/libetonyek-9999
+++ b/metadata/md5-cache/app-text/libetonyek-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 >=dev-util/mdds-0.12.1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) 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 dev-vcs/git
+DEFINED_PHASES=configure install prepare pretend unpack
+DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost dev-util/mdds:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) 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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Library parsing Apple Keynote presentations
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
 IUSE=doc static-libs test
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=7e513fed190bb2f53b0ef4a955881e8d
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=c0ff3fda065e2ee916c9eb3fef70a48d
diff --git a/metadata/md5-cache/app-text/libodfgen-0.1.6 b/metadata/md5-cache/app-text/libodfgen-0.1.6
new file mode 100644
index 000000000000..15019935a211
--- /dev/null
+++ b/metadata/md5-cache/app-text/libodfgen-0.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/librevenge >=dev-libs/boost-1.46 virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
+EAPI=6
+HOMEPAGE=http://libwpd.sf.net
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-2.1 MPL-2.0 )
+RDEPEND=dev-libs/librevenge
+SLOT=0
+SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.1.6.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=4bde250a3bf47b1887057c7c65383e7c
diff --git a/metadata/md5-cache/app-text/libodfgen-9999 b/metadata/md5-cache/app-text/libodfgen-9999
index 47aa89bacbd0..58f78da61eca 100644
--- a/metadata/md5-cache/app-text/libodfgen-9999
+++ b/metadata/md5-cache/app-text/libodfgen-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=dev-libs/librevenge >=dev-libs/boost-1.46 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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libwpd.sf.net
 IUSE=doc
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=322c4d55d6aee393279c413dfb4af9c3
+_md5_=4bde250a3bf47b1887057c7c65383e7c
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r2 b/metadata/md5-cache/app-text/ronn-0.7.3-r2
index 864874232459..ac5f2cd71e27 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r2
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ronn-0.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=83573bcaae0f491374b6a275570436b4
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r3 b/metadata/md5-cache/app-text/ronn-0.7.3-r3
index 8b91805ae3a4..5e1ca6f8a96c 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r3
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ronn-0.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=34d57f369897ad8536ec591c0cd22d17
diff --git a/metadata/md5-cache/app-text/tesseract-3.04.00-r4 b/metadata/md5-cache/app-text/tesseract-3.04.00-r4
index 5703e4014f43..d17d2a6e59e4 100644
--- a/metadata/md5-cache/app-text/tesseract-3.04.00-r4
+++ b/metadata/md5-cache/app-text/tesseract-3.04.00-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) scrollview? ( >=virtual/jre-1.7 ) scrollview? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/3.04.00.tar.gz -> tesseract-3.04.00.tar.gz https://github.com/tesseract-ocr/tessdata/raw/3.04.00/eng.traineddata -> eng.traineddata-3.04.00 doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz ) math? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/equ.traineddata -> equ.traineddata-3.04.00 ) linguas_ar? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ara.traineddata -> ara.traineddata-3.04.00 ) linguas_bg? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/bul.traineddata -> bul.traineddata-3.04.00 ) linguas_ca? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/cat.traineddata -> cat.traineddata-3.04.00 ) linguas_chr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chr.traineddata -> chr.traineddata-3.04.00 ) linguas_cs? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ces.traineddata -> ces.traineddata-3.04.00 ) linguas_de? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/deu.traineddata -> deu.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/deu_frak.traineddata -> deu_frak.traineddata-3.04.00 ) linguas_da? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/dan.traineddata -> dan.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/dan_frak.traineddata -> dan_frak.traineddata-3.04.00 ) linguas_el? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ell.traineddata -> ell.traineddata-3.04.00 ) linguas_es? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/spa.traineddata -> spa.traineddata-3.04.00 ) linguas_fi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/fin.traineddata -> fin.traineddata-3.04.00 ) linguas_fr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/fra.traineddata -> fra.traineddata-3.04.00 ) linguas_he? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/heb.traineddata -> heb.traineddata-3.04.00 ) linguas_hi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/hin.traineddata -> hin.traineddata-3.04.00 ) linguas_hu? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/hun.traineddata -> hun.traineddata-3.04.00 ) linguas_id? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ind.traineddata -> ind.traineddata-3.04.00 ) linguas_it? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ita.traineddata -> ita.traineddata-3.04.00 ) linguas_jp? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/jpn.traineddata -> jpn.traineddata-3.04.00 ) linguas_ko? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/kor.traineddata -> kor.traineddata-3.04.00 ) linguas_lt? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/lit.traineddata -> lit.traineddata-3.04.00 ) linguas_lv? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/lav.traineddata -> lav.traineddata-3.04.00 ) linguas_nl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/nld.traineddata -> nld.traineddata-3.04.00 ) linguas_no? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/nor.traineddata -> nor.traineddata-3.04.00 ) linguas_pl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/pol.traineddata -> pol.traineddata-3.04.00 ) linguas_pt? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/por.traineddata -> por.traineddata-3.04.00 ) linguas_ro? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ron.traineddata -> ron.traineddata-3.04.00 ) linguas_ru? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/rus.traineddata -> rus.traineddata-3.04.00 ) linguas_sk? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slk.traineddata -> slk.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slk_frak.traineddata -> slk_frak.traineddata-3.04.00 ) linguas_sl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slv.traineddata -> slv.traineddata-3.04.00 ) linguas_sr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/srp.traineddata -> srp.traineddata-3.04.00 ) linguas_sv? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/swe.traineddata -> swe.traineddata-3.04.00 ) linguas_th? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tha.traineddata -> tha.traineddata-3.04.00 ) linguas_tl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tgl.traineddata -> tgl.traineddata-3.04.00 ) linguas_tr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tur.traineddata -> tur.traineddata-3.04.00 ) linguas_uk? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ukr.traineddata -> ukr.traineddata-3.04.00 ) linguas_vi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/vie.traineddata -> vie.traineddata-3.04.00 ) linguas_zh_CN? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chi_sim.traineddata -> chi_sim.traineddata-3.04.00 ) linguas_zh_TW? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chi_tra.traineddata -> chi_tra.traineddata-3.04.00 ) osd? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/osd.traineddata -> osd.traineddata-3.04.00 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e046a95ede99653a73e08511273abf8b
diff --git a/metadata/md5-cache/app-text/trang-20091111 b/metadata/md5-cache/app-text/trang-20091111
index c6b79fe0d2e7..191ed9b89395 100644
--- a/metadata/md5-cache/app-text/trang-20091111
+++ b/metadata/md5-cache/app-text/trang-20091111
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jing-trang.googlecode.com/files/trang-20091111.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b4326ecf0f804358a4d23f67ee95d4c2
diff --git a/metadata/md5-cache/app-text/trang-20151127 b/metadata/md5-cache/app-text/trang-20151127
index 000223032507..6650da0a6140 100644
--- a/metadata/md5-cache/app-text/trang-20151127
+++ b/metadata/md5-cache/app-text/trang-20151127
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/relaxng/jing-trang/archive/1e74846999bbd14ce5248acbd2be9f1e624a9846.tar.gz -> trang-20151127.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=170fe3d75a0bea1833dae45ca03c0b84
diff --git a/metadata/md5-cache/app-text/webgen-1.3.0 b/metadata/md5-cache/app-text/webgen-1.3.0
index ef4c3f094deb..5569258c98e6 100644
--- a/metadata/md5-cache/app-text/webgen-1.3.0
+++ b/metadata/md5-cache/app-text/webgen-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/cmdparse-2.0.0:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/webgen-1.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a270cf414233d09539247cc7726f30ea
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.2.22 b/metadata/md5-cache/app-text/xapian-omega-1.2.22
index 1681f72bc6c7..32b28795ef37 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.2.22
+++ b/metadata/md5-cache/app-text/xapian-omega-1.2.22
@@ -3,9 +3,9 @@ DEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.22/xapian-omega-1.2.22.tar.xz
-_md5_=f447be8eeeed4e16af78047ab5369584
+_md5_=ae41e2d77f97b2d316579b1af75928c3
diff --git a/metadata/md5-cache/app-text/yelp-tools-3.18.0 b/metadata/md5-cache/app-text/yelp-tools-3.18.0
index 908a76156e60..d5eddc1f72a6 100644
--- a/metadata/md5-cache/app-text/yelp-tools-3.18.0
+++ b/metadata/md5-cache/app-text/yelp-tools-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gno
 DESCRIPTION=Collection of tools for building and converting documentation
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=|| ( GPL-2+ freedist ) GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.17.3 virtual/awk
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ea8e75a2306e835f55d3b17f23f8a218
+_md5_=7f597d30d4f07d012a95a32537b361c9
diff --git a/metadata/md5-cache/app-text/zemberek-server-0.7.1 b/metadata/md5-cache/app-text/zemberek-server-0.7.1
index 837194e498e5..358a4209c671 100644
--- a/metadata/md5-cache/app-text/zemberek-server-0.7.1
+++ b/metadata/md5-cache/app-text/zemberek-server-0.7.1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2
 RDEPEND=dev-java/zemberek[linguas_tr] dev-java/dbus-java dev-java/mina-core dev-java/slf4j-nop >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://zemberek.googlecode.com/files/zemberek-server-nolibs-0.7.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcf71a6803d067aabd268b7c92c882d3
diff --git a/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1 b/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
index 22da1ea34627..c6f6a724cdf0 100644
--- a/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
+++ b/metadata/md5-cache/app-text/zemberek-server-0.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1 GPL-2
 RDEPEND=dev-java/zemberek[linguas_tr] dev-java/dbus-java dev-java/mina-core dev-java/slf4j-nop >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://zemberek.googlecode.com/files/zemberek-server-nolibs-0.7.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=660db1fce093a7626d4fc165d6f3c608
diff --git a/metadata/md5-cache/app-vim/command-t-1.11.4 b/metadata/md5-cache/app-vim/command-t-1.11.4
index 4a2e643dfd36..dde067b6bc8b 100644
--- a/metadata/md5-cache/app-vim/command-t-1.11.4
+++ b/metadata/md5-cache/app-vim/command-t-1.11.4
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.11.4.tar.bz2 https://dev.gentoo.org/~radhermit/vim/command-t-1.11.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	vim-plugin	1bbfc3364a7588372fb4c21734f0cd96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	vim-plugin	1bbfc3364a7588372fb4c21734f0cd96
 _md5_=1cd1a84b604dd433300d0ff417f82f35
diff --git a/metadata/md5-cache/app-vim/command-t-1.13 b/metadata/md5-cache/app-vim/command-t-1.13
index 4b8688dcba16..5a7c55904023 100644
--- a/metadata/md5-cache/app-vim/command-t-1.13
+++ b/metadata/md5-cache/app-vim/command-t-1.13
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://gentoo/command-t-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/command-t-1.13.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	vim-plugin	1bbfc3364a7588372fb4c21734f0cd96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	vim-plugin	1bbfc3364a7588372fb4c21734f0cd96
 _md5_=1cd1a84b604dd433300d0ff417f82f35
diff --git a/metadata/md5-cache/dev-cpp/atkmm-2.24.2 b/metadata/md5-cache/dev-cpp/atkmm-2.24.2
index 723e95aaff3f..0f000fa5fcd4 100644
--- a/metadata/md5-cache/dev-cpp/atkmm-2.24.2
+++ b/metadata/md5-cache/dev-cpp/atkmm-2.24.2
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for the ATK library
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
 IUSE=doc 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 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.46.2:2[doc?,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/atk-2.18.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-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(-)?] !<dev-cpp/gtkmm-2.22.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/atkmm/2.24/atkmm-2.24.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6ce1270fcebcbd1d0e42af6a2459bcdb
+_md5_=3d51ae3f501dbf5ef3c1647ca67a2435
diff --git a/metadata/md5-cache/dev-cpp/cairomm-1.12.0-r1 b/metadata/md5-cache/dev-cpp/cairomm-1.12.0-r1
index 73b33bc26e4c..cadf71645a72 100644
--- a/metadata/md5-cache/dev-cpp/cairomm-1.12.0-r1
+++ b/metadata/md5-cache/dev-cpp/cairomm-1.12.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for the Cairo vector graphics library
 EAPI=5
 HOMEPAGE=http://cairographics.org/cairomm
 IUSE=aqua doc +svg 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/cairo-1.12.10[aqua=,svg=,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(-)?] >=dev-libs/libsigc++-2.5.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(-)?]
 SLOT=0
 SRC_URI=mirror://gnome/sources/cairomm/1.12/cairomm-1.12.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fb91ed99cdd6988b21e2f098afdb5669
+_md5_=4b92f78df23792a4773a247bb5a5a33d
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.2.7 b/metadata/md5-cache/dev-cpp/eigen-3.2.7
index 0e8d7a9c5e23..8e13ac6496ed 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.2.7
+++ b/metadata/md5-cache/dev-cpp/eigen-3.2.7
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( app-doc/doxygen[dot,latex] ) sys-devel/make >=dev-util/cmake-2.8.12
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=doc? ( app-doc/doxygen[dot,latex] ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/umfpack sci-libs/scotch sci-libs/spqr sci-libs/superlu dev-qt/qtcore:4 virtual/opengl virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-2.8.12 test? ( virtual/fortran )
 DESCRIPTION=C++ template library for linear algebra
-EAPI=5
+EAPI=6
 HOMEPAGE=http://eigen.tuxfamily.org/
-IUSE=debug doc
+IUSE=altivec debug doc openmp test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2 GPL-3
 RDEPEND=!dev-cpp/eigen:0
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.2.7.tar.bz2 -> eigen-3.2.7.tar.bz2
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6707fa209ef1de6853c9d0372887c685
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a5ab451115d29f3b85d00789d3fc8212
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.2.8 b/metadata/md5-cache/dev-cpp/eigen-3.2.8-r1
similarity index 95%
rename from metadata/md5-cache/dev-cpp/eigen-3.2.8
rename to metadata/md5-cache/dev-cpp/eigen-3.2.8-r1
index 5b9441a51b61..507d297a3779 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.2.8
+++ b/metadata/md5-cache/dev-cpp/eigen-3.2.8-r1
@@ -10,4 +10,4 @@ RDEPEND=!dev-cpp/eigen:0
 SLOT=3
 SRC_URI=https://bitbucket.org/eigen/eigen/get/3.2.8.tar.bz2 -> eigen-3.2.8.tar.bz2
 _eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7c87e2e07724dbf671e407081ee3d822
+_md5_=47b7fc1f8cb858da7c83cf2d485b106a
diff --git a/metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1 b/metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1
index fcc51a355f98..2924b9334752 100644
--- a/metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1
+++ b/metadata/md5-cache/dev-cpp/gconfmm-2.28.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for GConf
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/gconf-2.4:2 >=dev-cpp/glibmm-2.12:2[doc?] >=dev-cpp/gtkmm-2.4:2.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gconfmm/2.28/gconfmm-2.28.3.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=33ef9897416f5b357c5c2ad4936176a1
+_md5_=6009d7991b90a3b3b1eaae566ad7187e
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.46.3 b/metadata/md5-cache/dev-cpp/glibmm-2.46.3
index acc57fc40a37..103a2ba46224 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.46.3
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.46.3
@@ -4,10 +4,10 @@ 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
+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.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8ae15dcfb39970b332d8ebca612eac85
+_md5_=aacb08124832a9bc8004de336cf23550
diff --git a/metadata/md5-cache/dev-cpp/gnome-vfsmm-2.26.0-r1 b/metadata/md5-cache/dev-cpp/gnome-vfsmm-2.26.0-r1
index eab2b54946ac..592b99db7e1d 100644
--- a/metadata/md5-cache/dev-cpp/gnome-vfsmm-2.26.0-r1
+++ b/metadata/md5-cache/dev-cpp/gnome-vfsmm-2.26.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for gnome-vfs
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
 IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/gnome-vfs-2.8.1 >=dev-cpp/glibmm-2.12
 SLOT=1.1
 SRC_URI=mirror://gnome/sources/gnome-vfsmm/2.26/gnome-vfsmm-2.26.0.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a63352614c57470ae153922e17f1c4fb
+_md5_=45f14aab21b07e76f3419d0eb9d83a6b
diff --git a/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2 b/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2
index 2c26ce548d6a..f990abdc209a 100644
--- a/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2
+++ b/metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for gtkglext
 EAPI=5
 HOMEPAGE=https://projects.gnome.org/gtkglext/
 IUSE=doc debug
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=x11-libs/gtkglext-1 >=dev-libs/libsigc++-2.0 >=dev-cpp/glibmm-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 virtual/opengl
 SLOT=1.0
 SRC_URI=mirror://sourceforge/gtkglext/gtkglextmm-1.2.0.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0915c870e88cfb7bf567fb61ee1d8dc7
+_md5_=fbe995671b1c218ae5d45d146c9b97a0
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-2.24.4-r3 b/metadata/md5-cache/dev-cpp/gtkmm-2.24.4-r3
index a1e3089effbd..2480e65c03b3 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-2.24.4-r3
+++ b/metadata/md5-cache/dev-cpp/gtkmm-2.24.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for GTK+
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
 IUSE=doc 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.34.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+-2.24.15: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/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.22.7[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.10.0-r1[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.34.0: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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/gtkmm/2.24/gtkmm-2.24.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6906e5a6ba8ec133b21b982e51cb6ce3
+_md5_=39bfdb54bcad31e4e743011e658d044b
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.18.0-r1 b/metadata/md5-cache/dev-cpp/gtkmm-3.18.0-r1
index b757c8eb43c1..89717a624a12 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.18.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.18.0-r1
@@ -4,11 +4,11 @@ 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
+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.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dda5bce47aa3cd3d350b7aad749171f1
+_md5_=6d7e8e2b56ab863f84d7aba415e3c7a5
diff --git a/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1 b/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1
index 9fa382e14e98..010f04f6a071 100644
--- a/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1
+++ b/metadata/md5-cache/dev-cpp/gtksourceviewmm-2.10.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for gtksourceview
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-cpp/gtkmm-2.12:2.4 dev-cpp/atkmm >=x11-libs/gtksourceview-2.10.0:2.0 !>=dev-cpp/libgtksourceviewmm-1
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gtksourceviewmm/2.10/gtksourceviewmm-2.10.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d6dea6bd9191d3b76b783196304ab0b7
+_md5_=4487cf7a3d0a08bee1cda43695ede8f0
diff --git a/metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0 b/metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0
index 8c6124fa05f2..b8f58dcc6265 100644
--- a/metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0
+++ b/metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for gtksourceview
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-cpp/glibmm-2.46.1:2 >=dev-cpp/gtkmm-3.18.0:3.0 >=x11-libs/gtksourceview-3.18.0:3.0 dev-cpp/atkmm dev-cpp/cairomm dev-cpp/pangomm:1.4
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtksourceviewmm/3.18/gtksourceviewmm-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e1a9cd299031e82ed8db52cea7ffb9b5
+_md5_=2a608da53aa4f3ec9a5249fe407a2f4e
diff --git a/metadata/md5-cache/dev-cpp/libcmis-0.5.0-r1 b/metadata/md5-cache/dev-cpp/libcmis-0.5.0-r1
index 1e27cd049f9a..69339c6b57e4 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-0.5.0-r1
+++ b/metadata/md5-cache/dev-cpp/libcmis-0.5.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=!dev-cpp/libcmis:0 !dev-cpp/libcmis:0.2 !dev-cpp/libcmis:0.3 !dev-cpp/libcmis:0.4 dev-libs/boost:= dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppcheck 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
+DEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppcheck 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
 DESCRIPTION=C++ client library for the CMIS interface
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/libcmis/
 IUSE=static-libs man test
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
-RDEPEND=!dev-cpp/libcmis:0 !dev-cpp/libcmis:0.2 !dev-cpp/libcmis:0.3 !dev-cpp/libcmis:0.4 dev-libs/boost:= dev-libs/libxml2 net-misc/curl
+RDEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl !dev-cpp/libcmis:0 !dev-cpp/libcmis:0.2 !dev-cpp/libcmis:0.3 !dev-cpp/libcmis:0.4
 SLOT=0.5
 SRC_URI=mirror://sourceforge/libcmis/libcmis-0.5.0.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/libcmis-0.5.0-gcc5.patch.gz
 _eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=2d2c750ce94de2673655b77e8f996dff
+_md5_=3737a059818d4e8b2d0b35076823e7d9
diff --git a/metadata/md5-cache/dev-cpp/libcmis-9999 b/metadata/md5-cache/dev-cpp/libcmis-9999
index 320982c3f392..ea26961637cf 100644
--- a/metadata/md5-cache/dev-cpp/libcmis-9999
+++ b/metadata/md5-cache/dev-cpp/libcmis-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=!dev-cpp/libcmis:0 !dev-cpp/libcmis:0.2 !dev-cpp/libcmis:0.3 !dev-cpp/libcmis:0.4 dev-libs/boost:= dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppcheck 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 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl virtual/pkgconfig man? ( app-text/docbook2X dev-libs/libxslt ) test? ( dev-util/cppcheck 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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C++ client library for the CMIS interface
-EAPI=5
+EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/libcmis/
 IUSE=static-libs man test
 LICENSE=|| ( GPL-2 LGPL-2 MPL-1.1 )
-RDEPEND=!dev-cpp/libcmis:0 !dev-cpp/libcmis:0.2 !dev-cpp/libcmis:0.3 !dev-cpp/libcmis:0.4 dev-libs/boost:= dev-libs/libxml2 net-misc/curl
+RDEPEND=dev-libs/boost:= dev-libs/libxml2 net-misc/curl !dev-cpp/libcmis:0 !dev-cpp/libcmis:0.2 !dev-cpp/libcmis:0.3 !dev-cpp/libcmis:0.4
 SLOT=0.5
 _eclasses_=alternatives	b19e1ec28e600fa497461bddfb9c1f16	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5ecf596a972d055705f7994c1fd7f52e
+_md5_=2635025aa766636598fb87a55ef129fc
diff --git a/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2 b/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
index 8c9a70172165..c8c4494020ef 100644
--- a/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
+++ b/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for libglade
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
 IUSE=doc examples 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
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1+
 RDEPEND=>=gnome-base/libglade-2.6.4-r1:2.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/gtkmm-2.24.3:2.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-cpp/glibmm-2.34.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(-)?]
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libglademm/2.6/libglademm-2.6.7.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e5ec2954a1bfff09032ef20b21500793
+_md5_=e84952ee79bba7284f55c1dc6495edcb
diff --git a/metadata/md5-cache/dev-cpp/libgnomemm-2.30.0-r1 b/metadata/md5-cache/dev-cpp/libgnomemm-2.30.0-r1
index 828504dee58f..715ffba881f5 100644
--- a/metadata/md5-cache/dev-cpp/libgnomemm-2.30.0-r1
+++ b/metadata/md5-cache/dev-cpp/libgnomemm-2.30.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for libgnome
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
 IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-cpp/gtkmm-2.8:2.4 >=gnome-base/libgnome-2.6
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/libgnomemm/2.30/libgnomemm-2.30.0.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a0d49086d28c31fc9ce9d477f7d15f44
+_md5_=74240660c492e5b5c1b5a5650054c954
diff --git a/metadata/md5-cache/dev-cpp/libgnomeuimm-2.28.0-r2 b/metadata/md5-cache/dev-cpp/libgnomeuimm-2.28.0-r2
index 7a783ee54d20..3931df0abda0 100644
--- a/metadata/md5-cache/dev-cpp/libgnomeuimm-2.28.0-r2
+++ b/metadata/md5-cache/dev-cpp/libgnomeuimm-2.28.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=gnome-base/libgnomeui-2.7.1 dev-cpp/glibmm >=dev-cpp/libgnomemm-2.16.0
 DESCRIPTION=C++ bindings for libgnomeui
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=gnome-base/libgnomeui-2.7.1 dev-cpp/glibmm >=dev-cpp/libgnomemm-2.16.0 >=dev-cpp/libgnomecanvasmm-2.6 >=dev-cpp/gconfmm-2.6 >=dev-cpp/libglademm-2.4 >=dev-cpp/gnome-vfsmm-2.16
 SLOT=2.6
 SRC_URI=mirror://gnome/sources/libgnomeuimm/2.28/libgnomeuimm-2.28.0.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=461307bcc5b3120c3a3752150e5dab85
+_md5_=dff5913375ef38411e8cd02e6c333890
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-2.40.1 b/metadata/md5-cache/dev-cpp/libxmlpp-2.40.1
index 7a50c6ffe148..8fef41b37fe8 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-2.40.1
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-2.40.1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ wrapper for the libxml2 XML parser library
 EAPI=5
 HOMEPAGE=http://libxmlplusplus.sourceforge.net/
 IUSE=doc 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.7[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/glibmm-2.32[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.6
 SRC_URI=mirror://gnome/sources/libxml++/2.40/libxml++-2.40.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9502e0e04e1fca54e17ba79ef9137718
+_md5_=1332151e32711c1d8820e9aed069a4cf
diff --git a/metadata/md5-cache/dev-cpp/mm-common-0.9.10 b/metadata/md5-cache/dev-cpp/mm-common-0.9.10
index 7abb75fe9f82..68b344cb3067 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-0.9.10
+++ b/metadata/md5-cache/dev-cpp/mm-common-0.9.10
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/s
 DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnome/sources/mm-common/0.9/mm-common-0.9.10.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8bdeeb4d51db65e678ddb66b29bc7e59
+_md5_=a8b144b8949099395bd75725f64d739d
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.38.1 b/metadata/md5-cache/dev-cpp/pangomm-2.38.1
index 98ba1a11d44e..2f1819941fae 100644
--- a/metadata/md5-cache/dev-cpp/pangomm-2.38.1
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.38.1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for pango
 EAPI=5
 HOMEPAGE=http://www.gtkmm.org
 IUSE=doc 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 ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=x11-libs/pango-1.38.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/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(-)?] >=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-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(-)?] !<dev-cpp/gtkmm-2.13:2.4
 SLOT=1.4
 SRC_URI=mirror://gnome/sources/pangomm/2.38/pangomm-2.38.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=703dee0a905a5c9f4ef0e654092a386e
+_md5_=c335cc9dd5ad25a990c2bf0e5bb6c1c0
diff --git a/metadata/md5-cache/dev-db/4store-1.1.5 b/metadata/md5-cache/dev-db/4store-1.1.5-r1
similarity index 52%
rename from metadata/md5-cache/dev-db/4store-1.1.5
rename to metadata/md5-cache/dev-db/4store-1.1.5-r1
index 116afb03433a..9222f07f1b09 100644
--- a/metadata/md5-cache/dev-db/4store-1.1.5
+++ b/metadata/md5-cache/dev-db/4store-1.1.5-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install setup
-DEPEND=media-libs/raptor >=dev-libs/rasqal-0.9.18 dev-libs/libxml2 dev-libs/libpcre sys-libs/readline sys-libs/ncurses dev-libs/expat sys-libs/zlib
+DEPEND=media-libs/raptor >=dev-libs/rasqal-0.9.18 dev-libs/glib dev-libs/libxml2 dev-libs/libpcre sys-libs/readline sys-libs/ncurses dev-libs/expat sys-libs/zlib
 DESCRIPTION=4store is an efficient, scalable and stable RDF database
-EAPI=2
+EAPI=5
 HOMEPAGE=http://4store.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=media-libs/raptor >=dev-libs/rasqal-0.9.18 dev-libs/libxml2 dev-libs/libpcre sys-libs/readline sys-libs/ncurses dev-libs/expat sys-libs/zlib
+RDEPEND=media-libs/raptor >=dev-libs/rasqal-0.9.18 dev-libs/glib dev-libs/libxml2 dev-libs/libpcre sys-libs/readline sys-libs/ncurses dev-libs/expat sys-libs/zlib
 SLOT=0
 SRC_URI=http://4store.org/download/4store-v1.1.5.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=4309d8ff41feb2b27ee227795650270f
+_md5_=804fdd2bdf7387fd934dd1e501df045c
diff --git a/metadata/md5-cache/dev-db/apgdiff-1.4 b/metadata/md5-cache/dev-db/apgdiff-1.4
index 46df4f967663..07b362f898ba 100644
--- a/metadata/md5-cache/dev-db/apgdiff-1.4
+++ b/metadata/md5-cache/dev-db/apgdiff-1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/apgdiff/apgdiff-1.4-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a095c1a86c4811bdac6d847f4de17aa
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.1 b/metadata/md5-cache/dev-db/apgdiff-2.2.1
index bd3b1463f8da..eab66414398e 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.1
+++ b/metadata/md5-cache/dev-db/apgdiff-2.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.2.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a6ec1408962c79f9226cd68f1c39621
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.2 b/metadata/md5-cache/dev-db/apgdiff-2.2.2
index 7885a92629e3..32e3b0188d09 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.2
+++ b/metadata/md5-cache/dev-db/apgdiff-2.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.2.2-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3771e5b3f743ca660d94c570135967ed
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.3 b/metadata/md5-cache/dev-db/apgdiff-2.3
index c7c798844bb1..cd73246c5242 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.3
+++ b/metadata/md5-cache/dev-db/apgdiff-2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.3-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3771e5b3f743ca660d94c570135967ed
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.4 b/metadata/md5-cache/dev-db/apgdiff-2.4
index b7c8c28a299f..adc22306fbf7 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.4
+++ b/metadata/md5-cache/dev-db/apgdiff-2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apgdiff.com/download/apgdiff-2.4-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3771e5b3f743ca660d94c570135967ed
diff --git a/metadata/md5-cache/dev-db/db-je-3.3.75 b/metadata/md5-cache/dev-db/db-je-3.3.75
index c8f599f90578..fd900cbdc311 100644
--- a/metadata/md5-cache/dev-db/db-je-3.3.75
+++ b/metadata/md5-cache/dev-db/db-je-3.3.75
@@ -9,5 +9,5 @@ LICENSE=Sleepycat BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.3
 SRC_URI=http://download.oracle.com/berkeley-db/je-3.3.75.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db4cbf492edb623a1b3a2433bc4a0af0
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.8 b/metadata/md5-cache/dev-db/henplus-0.9.8
index c2e7c72efe3f..1c46c59405f8 100644
--- a/metadata/md5-cache/dev-db/henplus-0.9.8
+++ b/metadata/md5-cache/dev-db/henplus-0.9.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-cli:1 dev-java/libreadline-java:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/henplus/henplus-0.9.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5384eb7345cb0f679e76395024a58819
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.8-r1 b/metadata/md5-cache/dev-db/henplus-0.9.8-r1
index 997861eabc1b..cb39989b3dcb 100644
--- a/metadata/md5-cache/dev-db/henplus-0.9.8-r1
+++ b/metadata/md5-cache/dev-db/henplus-0.9.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-cli:1 dev-java/libreadline-java:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/henplus/henplus-0.9.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1038393e92615b0af1ab2864a04804d
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
index 66ca23a6385d..a51636095ff7 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=000679765bcdbcd74ddc14e4d13150b3
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.24 b/metadata/md5-cache/dev-db/mariadb-10.0.24
new file mode 100644
index 000000000000..f75b996a3475
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.24
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) !bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) libressl? ( dev-libs/libressl: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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.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(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=An enhanced, drop-in replacement for MySQL
+EAPI=5
+HOMEPAGE=http://mariadb.org/
+IUSE=bindist odbc oqgraph pam sphinx tokudb xml 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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
+RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) libressl? ( dev-libs/libressl: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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.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(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !<virtual/mysql-5.6-r4
+REQUIRED_USE=tokudb? ( jemalloc ) static? ( !pam ) ^^ ( yassl openssl libressl ) !server? ( !extraengine !embedded ) ?? ( tcmalloc jemalloc ) static? ( !libressl !openssl yassl )
+RESTRICT=!bindist? ( bindist )
+SLOT=0/18
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.24/source/mariadb-10.0.24.tar.gz mirror://gentoo/mysql-extras-20151223-1501Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20151223-1501Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20151223-1501Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20151223-1501Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20151223-1501Z.tar.bz2
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	mysql-multilib-r1	b9dbbe661d2d793c7481505175bfb4af	mysql_fx	198902d1634b4462a8070f8c933df0e8	prefix	e7f2b9c6e57342e5d25eac22fce23062	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e4f9a91eb88bad4d7f9786bbde836b95
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.2.22 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.22
index 1dc62e7131ef..ddc13d1a8bc6 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.2.22
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.2.22
@@ -12,5 +12,5 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.22.tar.gz https://downloads.skysql.com/files/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.22.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.22.tar.gz mirror://gentoo/mysql-extras-20151117-2040Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20151117-2040Z.tar.bz2
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	mysql-cmake	3f6ffc12a798037a17c82fe978c44b60	mysql-v2	bbe2e200266e2f91a3e0ccb04b234805	mysql_fx	198902d1634b4462a8070f8c933df0e8	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	mysql-cmake	3f6ffc12a798037a17c82fe978c44b60	mysql-v2	bbe2e200266e2f91a3e0ccb04b234805	mysql_fx	198902d1634b4462a8070f8c933df0e8	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40c23cae0963f9e9dc996ed583024c34
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.11 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.11
index ce562852abf3..ab54032946da 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.3.11
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.3.11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( yassl openssl libressl ) minimal? ( !extraengine !embedded ) t
 RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.3/mysql-cluster-gpl-7.3.11.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.11.tar.gz mirror://gentoo/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20151117-2040Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20151117-2040Z.tar.bz2
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	mysql-cmake	3f6ffc12a798037a17c82fe978c44b60	mysql-multilib	ed01972f1d676fb46177081af7fc3a06	mysql_fx	198902d1634b4462a8070f8c933df0e8	prefix	e7f2b9c6e57342e5d25eac22fce23062	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	mysql-cmake	3f6ffc12a798037a17c82fe978c44b60	mysql-multilib	ed01972f1d676fb46177081af7fc3a06	mysql_fx	198902d1634b4462a8070f8c933df0e8	prefix	e7f2b9c6e57342e5d25eac22fce23062	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7acec5e093d2286d7017b30191a27278
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
index b1273de761aa..bddb8d4a4cd2 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=java? ( >=virtual/jre-1.4 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da78d3918969852787167c2458063c17
diff --git a/metadata/md5-cache/dev-db/rqlite-1.0 b/metadata/md5-cache/dev-db/rqlite-1.0
index 6cfd61444abe..61ba4af858c9 100644
--- a/metadata/md5-cache/dev-db/rqlite-1.0
+++ b/metadata/md5-cache/dev-db/rqlite-1.0
@@ -9,4 +9,4 @@ 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	1f6a08c05da2d91150032ff45db6a2c5	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec
-_md5_=db10aab71e8c51817f49cb581e43b556
+_md5_=833de82843222b7011393d6aaccbe2c0
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87 b/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
index b1dfe81ba162..14a2d145890c 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
+++ b/metadata/md5-cache/dev-db/sqldeveloper-3.2.20.09.87
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.6.0 mssql? ( dev-java/jtds:1.2 ) mysql? ( dev-java/jdbc-
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sqldeveloper-3.2.20.09.87-no-jre.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fae04dd70cf7d10ece323c25581edd00
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21 b/metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21
index eb25eb18a6b5..5af833d72aa0 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21
+++ b/metadata/md5-cache/dev-db/sqldeveloper-4.0.2.15.21
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.7.0 dev-java/java-config:2 mssql? ( dev-java/jtds:1.2 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sqldeveloper-4.0.2.15.21-no-jre.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f9bab45007ae942174034a53431abd89
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-4.1.1.19.59 b/metadata/md5-cache/dev-db/sqldeveloper-4.1.1.19.59
index 7ff55b27c303..960a05bb5088 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-4.1.1.19.59
+++ b/metadata/md5-cache/dev-db/sqldeveloper-4.1.1.19.59
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8.0 dev-java/java-config:2 mssql? ( dev-java/jtds:1.2 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sqldeveloper-4.1.1.19.59-no-jre.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=229fcb502d01ef154370d7032f709ef3
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-4.1.3.20.78 b/metadata/md5-cache/dev-db/sqldeveloper-4.1.3.20.78
index 36a82ad25dcc..b7df5f6eece0 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-4.1.3.20.78
+++ b/metadata/md5-cache/dev-db/sqldeveloper-4.1.3.20.78
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8.0 dev-java/java-config:2 mssql? ( dev-java/jtds:1.2 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sqldeveloper-4.1.3.20.78-no-jre.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3bb1dac7236db6c29518245b3249116c
diff --git a/metadata/md5-cache/dev-db/sqldeveloper-4.1.3.20.78-r1 b/metadata/md5-cache/dev-db/sqldeveloper-4.1.3.20.78-r1
index 1c0c74c3b14b..f2f68d4427b5 100644
--- a/metadata/md5-cache/dev-db/sqldeveloper-4.1.3.20.78-r1
+++ b/metadata/md5-cache/dev-db/sqldeveloper-4.1.3.20.78-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.8 mssql? ( dev-java/jtds:1.3 ) mysql? ( dev-java/jdbc-my
 RESTRICT=fetch
 SLOT=0
 SRC_URI=sqldeveloper-4.1.3.20.78-no-jre.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a9f724f6c752ffe67c439e0c8340179
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1 b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
index f15c4f1efa3c..acab0f2f54cd 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
+++ b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.1
@@ -9,5 +9,5 @@ LICENSE=ZLIB GPL-2-with-linking-exception
 RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca61ec2520b71b6f61139af878cde63a
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2 b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
index 8c63e19528ce..77b2ecfee8e0 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
+++ b/metadata/md5-cache/dev-dotnet/ikvm-0.46.0.2
@@ -9,5 +9,5 @@ LICENSE=ZLIB GPL-2-with-linking-exception
 RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.frijters.net/openjdk6-b22-stripped.zip http://www.frijters.net/ikvmsrc-0.46.0.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d87c81e839c4c46db2cd90a3da9c47e9
diff --git a/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2 b/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
index dacb891b42c5..a17a32075385 100644
--- a/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
+++ b/metadata/md5-cache/dev-dotnet/ikvm-7.1.4532.2
@@ -9,5 +9,5 @@ LICENSE=ZLIB GPL-2-with-linking-exception
 RDEPEND=>=dev-lang/mono-2 dev-libs/glib >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.frijters.net/openjdk-7u4-stripped.zip http://www.frijters.net/ikvmsrc-7.1.4532.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bde0f2ff20bac8816138840241c8722
diff --git a/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r2 b/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r2
index 790a369e96a6..63ccc0d9ae2e 100644
--- a/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r2
+++ b/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Mono DBus API wrapper for Zeitgeist
 EAPI=5
 HOMEPAGE=https://launchpad.net/zeitgeist-sharp/
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-dotnet/dbus-sharp:1.0 dev-dotnet/dbus-sharp-glib:1.0 dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=https://launchpad.net/zeitgeist-sharp/0.8/0.8.0/+download/zeitgeist-sharp-0.8.0.0.tar.gz doc? ( https://launchpad.net/zeitgeist-sharp/0.8/0.8.0/+download/zeitgeist-sharp-docs-0.8.0.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=031f0515706c8825a3aaa351fabfd43f
+_md5_=801bcdf4f5782c576080b08752bc4ade
diff --git a/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1 b/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
index 35613ce5e7f9..ee90a29643ed 100644
--- a/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
+++ b/metadata/md5-cache/dev-embedded/arduino-1.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jna:0 >dev-java/rxtx-2.1:2 dev-embedded/avrdude dev-embedded/ui
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=https://arduino.googlecode.com/files/arduino-1.0.5-src.tar.gz mirror://gentoo/arduino-icons.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f434acd363b7c9acc3d52de5ee5c6b2
diff --git a/metadata/md5-cache/dev-games/crystalspace-2.0-r1 b/metadata/md5-cache/dev-games/crystalspace-2.0-r1
index f86385e031db..2876409b2f36 100644
--- a/metadata/md5-cache/dev-games/crystalspace-2.0-r1
+++ b/metadata/md5-cache/dev-games/crystalspace-2.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=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/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 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	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=663ed4292dc672abf666295378e4736c
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4 b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
index 7f055e032f5f..307e7a169468 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
+++ b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
@@ -4,10 +4,10 @@ DESCRIPTION=Pass input from an enumerator to an Attoparsec parser
 EAPI=5
 HOMEPAGE=https://john-millikin.com/software/attoparsec-enumerator/
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.4
 SRC_URI=mirror://hackage/packages/archive/attoparsec-enumerator/0.3.4/attoparsec-enumerator-0.3.4.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3d91ff02e5377d3e9306cb53e9c887a1
+_md5_=4667cb9c6c75db16565cf1b2facf8323
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.0.1 b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.0.1
index d0dd14e7372c..870d91f85413 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-0.4.0.1
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-0.4.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Efficient buffered output
 EAPI=5
 HOMEPAGE=https://github.com/lpsmith/blaze-builder
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-haskell/bytestring-builder:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.4.0.1
 SRC_URI=mirror://hackage/packages/archive/blaze-builder/0.4.0.1/blaze-builder-0.4.0.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9f7f004f25cf3d1ff81233f9725c90f8
+_md5_=129bdd96a1cd20b6a2cf878129179fa1
diff --git a/metadata/md5-cache/dev-haskell/blaze-builder-enumerator-0.2.1.0 b/metadata/md5-cache/dev-haskell/blaze-builder-enumerator-0.2.1.0
index 64adf1b92050..0c6f0b65b2c5 100644
--- a/metadata/md5-cache/dev-haskell/blaze-builder-enumerator-0.2.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-builder-enumerator-0.2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Enumeratees for the incremental conversion of builders to bytestring
 EAPI=5
 HOMEPAGE=https://github.com/meiersi/blaze-builder-enumerator
 IUSE=+newbuilder doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/enumerator-0.4.3.1:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/streaming-commons-0.1.10:=[profile?] <dev-haskell/streaming-commons-0.2:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= newbuilder? ( >=dev-haskell/blaze-builder-0.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?] ) !newbuilder? ( >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] )
 SLOT=0/0.2.1.0
 SRC_URI=mirror://hackage/packages/archive/blaze-builder-enumerator/0.2.1.0/blaze-builder-enumerator-0.2.1.0.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6d47752840a5686acf06876d5e7cf53d
+_md5_=d21f7db98edd1dda4c77ae0b6ee15420
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.1 b/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.1
index 9f58e00352ca..af3a0a5d685f 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.1
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=A blazingly fast HTML combinator library for Haskell
 EAPI=5
 HOMEPAGE=http://jaspervdj.be/blaze
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.8.1.1
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.8.1.1/blaze-html-0.8.1.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3aa3afed4072299b2bf89d96642eb7ed
+_md5_=1606035352058163bd6792b70198ce63
diff --git a/metadata/md5-cache/dev-haskell/blaze-markup-0.7.0.3 b/metadata/md5-cache/dev-haskell/blaze-markup-0.7.0.3
index 01185054ba17..ae7ac19812c9 100644
--- a/metadata/md5-cache/dev-haskell/blaze-markup-0.7.0.3
+++ b/metadata/md5-cache/dev-haskell/blaze-markup-0.7.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=A blazingly fast markup combinator library for Haskell
 EAPI=5
 HOMEPAGE=http://jaspervdj.be/blaze
 IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.7.0.3
 SRC_URI=mirror://hackage/packages/archive/blaze-markup/0.7.0.3/blaze-markup-0.7.0.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4f418b52d434783a8bd425c687b4ce16
+_md5_=26cdb8c8b4356dacadf2d288bf32e9c0
diff --git a/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1 b/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
index fbc5d2cacc88..6c1f839f0774 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
+++ b/metadata/md5-cache/dev-haskell/bytestring-mmap-0.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=mmap support for strict ByteStrings
 EAPI=5
 HOMEPAGE=http://code.haskell.org/~dons/code/bytestring-mmap/
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ghc-6.10.4:=
 SLOT=0/0.2.2
 SRC_URI=mirror://hackage/packages/archive/bytestring-mmap/0.2.2/bytestring-mmap-0.2.2.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7a9edb05b6db82cb04d91fc2d260fe25
+_md5_=f7007118f18194e08c9f2403c33201e9
diff --git a/metadata/md5-cache/dev-haskell/enumerator-0.4.20 b/metadata/md5-cache/dev-haskell/enumerator-0.4.20
index 391232e86898..67af8c3f0a65 100644
--- a/metadata/md5-cache/dev-haskell/enumerator-0.4.20
+++ b/metadata/md5-cache/dev-haskell/enumerator-0.4.20
@@ -4,10 +4,10 @@ DESCRIPTION=Reliable, high-performance processing with left-fold enumerators
 EAPI=5
 HOMEPAGE=https://john-millikin.com/software/enumerator/
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/text-0.7:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/0.4.20
 SRC_URI=mirror://hackage/packages/archive/enumerator/0.4.20/enumerator-0.4.20.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=320c7fd6ceaae6d0a16cb22b911a2fb1
+_md5_=a7a7bd63c97d20d39865b951fd1575b4
diff --git a/metadata/md5-cache/dev-haskell/hsopenssl-0.11.1.1-r1 b/metadata/md5-cache/dev-haskell/hsopenssl-0.11.1.1-r1
index c747c05a14fb..39d232f4efe7 100644
--- a/metadata/md5-cache/dev-haskell/hsopenssl-0.11.1.1-r1
+++ b/metadata/md5-cache/dev-haskell/hsopenssl-0.11.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Partial OpenSSL binding for Haskell
 EAPI=5
 HOMEPAGE=https://github.com/phonohawk/HsOpenSSL
 IUSE=+fast-bignum libressl doc hscolour profile test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=>=dev-haskell/network-2.1:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
 RESTRICT=test
 SLOT=0/0.11.1.1
 SRC_URI=mirror://hackage/packages/archive/HsOpenSSL/0.11.1.1/HsOpenSSL-0.11.1.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7668a0dae08822cb14d6b1edf7c065e5
+_md5_=a23e82003091be01c4f15b67f6012e74
diff --git a/metadata/md5-cache/dev-haskell/snap-core-0.9.8.0 b/metadata/md5-cache/dev-haskell/snap-core-0.9.8.0
index d42db151499b..8fa44f7ef454 100644
--- a/metadata/md5-cache/dev-haskell/snap-core-0.9.8.0
+++ b/metadata/md5-cache/dev-haskell/snap-core-0.9.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Snap: A Haskell Web Framework (core interfaces and types)
 EAPI=5
 HOMEPAGE=http://snapframework.com/
 IUSE=debug portable doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-builder-enumerator-0.2:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?] >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/hunit-1.2:=[profile?] <dev-haskell/hunit-2:=[profile?] >=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-2:=[profile?] >=dev-haskell/regex-posix-0.95:=[profile?] <dev-haskell/regex-posix-1:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/unordered-containers-0.1.4.3:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.6:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zlib-enum-0.2.1:=[profile?] <dev-haskell/zlib-enum-0.3:=[profile?] >=dev-lang/ghc-7.4.1:= || ( ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.2:=[profile?] ) ( >=dev-haskell/hashable-1.2.1:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) ) portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2:=[profile?] ) !portable? ( >=dev-haskell/bytestring-mmap-0.2.2:=[profile?] <dev-haskell/bytestring-mmap-0.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-2:=[profile?] )
 SLOT=0/0.9.8.0
 SRC_URI=mirror://hackage/packages/archive/snap-core/0.9.8.0/snap-core-0.9.8.0.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fa345ca938d909b3c441fb53387002f9
+_md5_=79a46aa667fcae7d4840a70b132606b2
diff --git a/metadata/md5-cache/dev-haskell/snap-server-0.9.5.1-r1 b/metadata/md5-cache/dev-haskell/snap-server-0.9.5.1-r1
index cf562649df5e..5d0a58cf15b7 100644
--- a/metadata/md5-cache/dev-haskell/snap-server-0.9.5.1-r1
+++ b/metadata/md5-cache/dev-haskell/snap-server-0.9.5.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A fast, iteratee-based, epoll-enabled web server for the Snap Framew
 EAPI=5
 HOMEPAGE=http://snapframework.com/
 IUSE=debug openssl portable doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/attoparsec-enumerator-0.3:=[profile?] <dev-haskell/attoparsec-enumerator-0.4:=[profile?] >=dev-haskell/blaze-builder-0.2.1.4:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-builder-enumerator-0.2.0:=[profile?] <dev-haskell/blaze-builder-enumerator-0.3:=[profile?] >=dev-haskell/case-insensitive-0.3:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?] >=dev-haskell/enumerator-0.4.15:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] <dev-haskell/monadcatchio-transformers-0.4:=[profile?] >=dev-haskell/mtl-2:=[profile?] <dev-haskell/mtl-3:=[profile?] >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.7:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/snap-core-0.9.3:=[profile?] <dev-haskell/snap-core-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unix-compat-0.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= openssl? ( >=dev-haskell/hsopenssl-0.10:=[profile?] <dev-haskell/hsopenssl-0.12:=[profile?] )
 SLOT=0/0.9.5.1
 SRC_URI=mirror://hackage/packages/archive/snap-server/0.9.5.1/snap-server-0.9.5.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1bc8e8b134ec27c941b0d3ae444fbf17
+_md5_=4534fad2b84923a06dc2bd957e5cc47c
diff --git a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.1 b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.1
index ae44e52413a9..483347a00723 100644
--- a/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.1
+++ b/metadata/md5-cache/dev-haskell/time-locale-compat-0.1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Compatibility of TimeLocale between old-locale and time-1.5
 EAPI=5
 HOMEPAGE=https://github.com/khibino/haskell-time-locale-compat
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-haskell/old-locale:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.1.1
 SRC_URI=mirror://hackage/packages/archive/time-locale-compat/0.1.1.1/time-locale-compat-0.1.1.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5065ae57502c7b688667006e62cd40bb
+_md5_=6676dfb04dc472e2f91961d99091571e
diff --git a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1 b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1
index 2e8ff3bcfb36..e7bd2a0a615c 100644
--- a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1
+++ b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Enumerator interface for zlib compression
 EAPI=5
 HOMEPAGE=https://github.com/maltem/zlib-enum
 IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.2.3.1
 SRC_URI=mirror://hackage/packages/archive/zlib-enum/0.2.3.1/zlib-enum-0.2.3.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	ghc-package	892c6c35a9ac0993e65049c039438508	haskell-cabal	2d9bae28d8a91ec04d1bb1ef0071c64f	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2589340ddbc782b6eb5eab71234de327
+_md5_=8343ebf455f77b358839ea06863849bf
diff --git a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1 b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
index 6d56ba9bf5f2..421b7eef5ccf 100644
--- a/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
+++ b/metadata/md5-cache/dev-java/absolutelayout-6.7_beta-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 CDDL )
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/absolutelayout-6.7_beta.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df1c57aaf6f5f7b8133bae567c1681b2
diff --git a/metadata/md5-cache/dev-java/annogen-0.1.0-r3 b/metadata/md5-cache/dev-java/annogen-0.1.0-r3
index 2af879c92edd..d4fe4283da35 100644
--- a/metadata/md5-cache/dev-java/annogen-0.1.0-r3
+++ b/metadata/md5-cache/dev-java/annogen-0.1.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/qdox:1.6 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dist.codehaus.org/annogen/distributions/annogen-0.1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=37a8165e246388373e46441b7e5d2826
diff --git a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
index 69fb5a75ed88..b7ed8709ee3e 100644
--- a/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-antlr-1.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2ac92abe8267b2f7f4b0b259cc21124
diff --git a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
index eb4bc879ce77..8ec776103f05 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bcel-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bcel-5.1-r3:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e60b98206088a5f7a7c3c1aefe7cb335
diff --git a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
index 4022b8e6af23..fe342e6e66e8 100644
--- a/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-bsf-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?] >=dev-java/java-co
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87ac72eef99ed1837b184ea48d99898a
diff --git a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
index 8aaf9da5695f..280a7bc189bb 100644
--- a/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-log4j-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/log4j-1.2.13-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed1053fd4f0be2a4e8c10b201cfbb7c1
diff --git a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
index 980de8c75f53..623911eb76bb 100644
--- a/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-oro-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-oro-2.0.8-r2:2.0 >=dev-java/java-config-2.2.0 ~dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54b15853f8657cb74d621b0b4cdd482c
diff --git a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
index 49daa2b3e0c6..5132da34b6c2 100644
--- a/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-regexp-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jakarta-regexp-1.4-r1:1.4 >=dev-java/java-config-2.2.0 ~dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb0d2e09130e9cff002658d8d352206d
diff --git a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2 b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
index 3f78a6a2c658..16024d5f10a6 100644
--- a/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-apache-resolver-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/xml-commons-resolver-1.2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0e7e90aa355559dd425ee59262b38fc
diff --git a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
index 8bbefe85da5c..30d4970f25e4 100644
--- a/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-apache-xalan2-1.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xalan:0 dev-java/xalan-serializer:0 >=dev-java/java-config-2.2.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4dc377139f2baefe7e6133f1dc82550
diff --git a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
index 628a4a02981e..c7fbe3485e0f 100644
--- a/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-logging-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-logging-1.0.4-r2:0 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d93c99deba2b70ad3f268c2e2ebd54a1
diff --git a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2 b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
index 0d0f925e0447..8902e9d69625 100644
--- a/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-commons-net-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/commons-net-1.4.1-r1:0 >=dev-java/java-config-2.2.0 ~dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d4bc4818b982769e0ada75656e0f8f
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
index d38a2f58cb41..e4612658a810 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/bcel-5.1 >=dev-java/xerces-2.7 >=dev-java/a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b2-src.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0e46649700bf9ad0f395a86a83d35af
diff --git a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1 b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
index 29e35042a35a..046fcd25f4a4 100644
--- a/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
+++ b/metadata/md5-cache/dev-java/ant-contrib-1.0_beta3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/bcel-5.1:0 dev-java/commons-httpclient:3 de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-src.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c50557314f60f4d23092678ae6b03d69
diff --git a/metadata/md5-cache/dev-java/ant-core-1.9.2 b/metadata/md5-cache/dev-java/ant-core-1.9.2
index 445110f6e903..e2bcf5f5a8ef 100644
--- a/metadata/md5-cache/dev-java/ant-core-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-core-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk ) !dev-java/ant-tasks !dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ec71def9bdeec62c51ecf2af3c42f24
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
index e9baf7f84a6d..0f4426a0c3de 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.2.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.4 ~dev-java/eclipse-ecj-4.2.1 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5466c338e4f3e9001405d01b0c9dea8a
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
index 4bc479ac70bc..c4248acba076 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.4.2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.4.2:4.4 >=dev-java/ant-core-1.7 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8fb10427b0cbc6248815bcb7155b1de
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
index 27325dd8764b..b281a14af63f 100644
--- a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.5.1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=~dev-java/eclipse-ecj-4.5.1:4.5 >=dev-java/ant-core-1.7 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2323770c7b61d3a38623dac042ccfc5
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
index 289b75cc3761..cf07767df4b8 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/commons-cli-1* =dev-java/c
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jayasoft.org/downloads/ivy/1.3.1/ivy-1.3.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6cf21397e4fa1ee8cebbc3ec07f8b7d7
diff --git a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1 b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
index a36588761dca..549a5ba0b3a3 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/ant-ivy-1.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/commons-cli:1 dev-java/commons-httpclient:3 dev-java/commons-vfs:0 dev-java/jakarta-oro:2.0 dev-java/jsch:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jaya.free.fr/downloads/ivy/1.4.1/ivy-1.4.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd5e0be2d75e7b4e7d262a34284f9ecc
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.0.0 b/metadata/md5-cache/dev-java/ant-ivy-2.0.0
index 256619978910..3ac6f838b0fe 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.0.0
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 dev-java/jakarta-oro:2.0 dev-java/
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.0.0/apache-ivy-2.0.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=229bfbf4c04d5ca0e923ab10704d97ad
diff --git a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2 b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
index 09198fbacd07..0bfa914230a5 100644
--- a/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
+++ b/metadata/md5-cache/dev-java/ant-ivy-2.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/jsch:0 dev-java/bcpg:1.50 dev-java/ant-core:0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/ant/ivy/2.3.0/apache-ivy-2.3.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f2219679c44f598fdd9c5d02c12120e
diff --git a/metadata/md5-cache/dev-java/ant-jai-1.9.2 b/metadata/md5-cache/dev-java/ant-jai-1.9.2
index ac5a8a6209f6..050b3d7b06ec 100644
--- a/metadata/md5-cache/dev-java/ant-jai-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jai-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/sun-jai-bin-1.1.2.01-r1 >=dev-java/java-config-2.2.0 ~dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d463876051a4ae88b7450e57db4fe8f
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.2 b/metadata/md5-cache/dev-java/ant-javamail-1.9.2
index 2ffeacb0ca69..4055d50bfd1e 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/javamail java-virtuals/jaf >=dev-java/java-config-2.2.0 ~d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e11f81aaf8c823decee440b7d19032d8
diff --git a/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r1
index 223c804c39a6..5462178e6204 100644
--- a/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-javamail-1.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/oracle-javamail:0 java-virtuals/jaf:0 >=dev-java/java-config-2.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=21f2ec7cd87648a2a3912a0ff18187c8
diff --git a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2 b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
index b7a6e3f05822..c7e2baf324d1 100644
--- a/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jdepend-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jdepend-2.9-r2:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08e9d7f8af95c6edbcf2817da71fee76
diff --git a/metadata/md5-cache/dev-java/ant-jmf-1.9.2 b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
index 0e3f4d3f7d27..49b61da74223 100644
--- a/metadata/md5-cache/dev-java/ant-jmf-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jmf-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=66522c0bfe65bf26d7c44624b46b83b8
diff --git a/metadata/md5-cache/dev-java/ant-jsch-1.9.2 b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
index fcd38e3190ad..80b9cc83bcb0 100644
--- a/metadata/md5-cache/dev-java/ant-jsch-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-jsch-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jsch-0.1.37:0 >=dev-java/java-config-2.2.0 ~dev-java/ant-core
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f9e1bd47c4bb6f121625a97942201420
diff --git a/metadata/md5-cache/dev-java/ant-junit-1.9.2 b/metadata/md5-cache/dev-java/ant-junit-1.9.2
index 5a6ddcbd6fd6..5b6bc82e2390 100644
--- a/metadata/md5-cache/dev-java/ant-junit-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 >=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb3aea82a9a7ff5e5eb2bde185240b32
diff --git a/metadata/md5-cache/dev-java/ant-junit4-1.9.2 b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
index 794535c3c6c4..0d12cd751365 100644
--- a/metadata/md5-cache/dev-java/ant-junit4-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-junit4-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/junit:4 ~dev-java/ant-junit-1.9.2 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d7c18cd259c244e280005fa5dd2ad5d
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2 b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
index 2e12a8d1b4de..473181eaf35f 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0d87189cc265b742995287b25e1ee2ea
diff --git a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2 b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
index ee8e30d567fe..20337f3d2237 100644
--- a/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
+++ b/metadata/md5-cache/dev-java/ant-owanttask-1.3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xalan >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.forge.objectweb.org/monolog/ow_util_ant_tasks_1.3.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=400e1c0745193f1cab96fe38c978dcc7
diff --git a/metadata/md5-cache/dev-java/ant-swing-1.9.2 b/metadata/md5-cache/dev-java/ant-swing-1.9.2
index db27bc20d80f..e7ca82cecde5 100644
--- a/metadata/md5-cache/dev-java/ant-swing-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-swing-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0 >=virtual/jre-1.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9085eee68b1619bcc37824b7ff7870ed
diff --git a/metadata/md5-cache/dev-java/ant-testutil-1.9.2 b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
index 47531159ecae..17dc18980d19 100644
--- a/metadata/md5-cache/dev-java/ant-testutil-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-testutil-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 ~dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0020710e1259842f7b56283538bbd275
diff --git a/metadata/md5-cache/dev-java/ant-trax-1.9.2 b/metadata/md5-cache/dev-java/ant-trax-1.9.2
index f7e1c2a0620d..3e8621a47295 100644
--- a/metadata/md5-cache/dev-java/ant-trax-1.9.2
+++ b/metadata/md5-cache/dev-java/ant-trax-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/java-config-2.2.0 ~dev-java/ant-core-1.9.2:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.9.2-src.tar.bz2 https://dev.gentoo.org/~tomwij/files/dist/ant-1.9.2-gentoo.tar.bz2
-_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=ant-tasks	835fd8e281e4c51482eb1a6d178c936f	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e720584b8d913450f5b37f2d72a45ac6
diff --git a/metadata/md5-cache/dev-java/antlr-2.7.7-r7 b/metadata/md5-cache/dev-java/antlr-2.7.7-r7
index 01af68fdbe85..237a2240521a 100644
--- a/metadata/md5-cache/dev-java/antlr-2.7.7-r7
+++ b/metadata/md5-cache/dev-java/antlr-2.7.7-r7
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.antlr2.org/download/antlr-2.7.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1e41f44e2ed86fd21e8096e2b0e5d5b
diff --git a/metadata/md5-cache/dev-java/antlr-3.2 b/metadata/md5-cache/dev-java/antlr-3.2
index 4a2c35af39f5..cbe0a6a42939 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2
+++ b/metadata/md5-cache/dev-java/antlr-3.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=3
 SRC_URI=http://www.antlr3.org/download/antlr-3.2.tar.gz http://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8a60f4deec3806dff43e79906eb70016
diff --git a/metadata/md5-cache/dev-java/antlr-3.5.2 b/metadata/md5-cache/dev-java/antlr-3.5.2
index ee6ed2d85662..d4b2423eefc1 100644
--- a/metadata/md5-cache/dev-java/antlr-3.5.2
+++ b/metadata/md5-cache/dev-java/antlr-3.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/stringtemplate:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=3.5
 SRC_URI=https://github.com/antlr/antlr3/archive/3.5.2.tar.gz -> antlr-3.5.2.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad2d3eb905783a67e5a1c6f6212617ae
diff --git a/metadata/md5-cache/dev-java/antlr-4.4 b/metadata/md5-cache/dev-java/antlr-4.4
index 339627addfcd..3c10d52d4888 100644
--- a/metadata/md5-cache/dev-java/antlr-4.4
+++ b/metadata/md5-cache/dev-java/antlr-4.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/stringtemplate-3.2:0 gunit? ( dev-java/junit:4 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.4.zip http://www.antlr3.org/download/antlr-3.5.2-complete-no-st3.jar http://www.antlr.org/download/antlr-4.3-complete.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bbcc9acc3382fe8380d9aae31d6e7fbe
diff --git a/metadata/md5-cache/dev-java/antlr-4.5.1 b/metadata/md5-cache/dev-java/antlr-4.5.1
index 28e69f6cd961..d7090c7f734c 100644
--- a/metadata/md5-cache/dev-java/antlr-4.5.1
+++ b/metadata/md5-cache/dev-java/antlr-4.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/antlr:3.5 dev-java/stringtemplate:4 dev-java/treelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/antlr/antlr4/archive/4.5.1.tar.gz -> antlr-4.5.1.tar.gz http://www.antlr.org/download/antlr-4.5.1-complete.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b930a603d5189fa4d9df346dfa938dff
diff --git a/metadata/md5-cache/dev-java/aopalliance-1.0-r2 b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
index d7edb973c2dc..81081e98f1de 100644
--- a/metadata/md5-cache/dev-java/aopalliance-1.0-r2
+++ b/metadata/md5-cache/dev-java/aopalliance-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/aopalliance-1.0-gentoo.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e6d3b0dc3d712802dc3e18d74892b33
diff --git a/metadata/md5-cache/dev-java/appframework-1.03-r4 b/metadata/md5-cache/dev-java/appframework-1.03-r4
index 5b16218bc470..759e6986fa05 100644
--- a/metadata/md5-cache/dev-java/appframework-1.03-r4
+++ b/metadata/md5-cache/dev-java/appframework-1.03-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/swing-worker:0 >=dev-java/java-config-2.2.0 s
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/AppFramework-1.03-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e13dfc847b3f103083cd5aef99c63c3
diff --git a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5 b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5
index 9bb79135ff10..63b20793333c 100644
--- a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5
+++ b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5
@@ -9,5 +9,5 @@ LICENSE=Apple
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> apple-java-extensions-bin-1.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f60c7e3e17ab0b2c0c05c8af225bb01
diff --git a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r1 b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r1
index 680e32ff9194..5755dd4674f9 100644
--- a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r1
+++ b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apple
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> apple-java-extensions-bin-1.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=896470c64a972a8d8de0e48dfc645a63
diff --git a/metadata/md5-cache/dev-java/apt-mirror-1.0-r1 b/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
index 6a7428dfadf7..acae5c5c4034 100644
--- a/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
+++ b/metadata/md5-cache/dev-java/apt-mirror-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/apt-mirror-1.0.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e7aa15b3251f12275412ef5c0ef0926
diff --git a/metadata/md5-cache/dev-java/args4j-2.32 b/metadata/md5-cache/dev-java/args4j-2.32
index 7d1afd8529a7..8a738e9613e1 100644
--- a/metadata/md5-cache/dev-java/args4j-2.32
+++ b/metadata/md5-cache/dev-java/args4j-2.32
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=2
 SRC_URI=http://repo1.maven.org/maven2/args4j/args4j/2.32/args4j-2.32-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=00a15799d3d1f8649f80c5f1830c6c08
diff --git a/metadata/md5-cache/dev-java/asm-2.0-r2 b/metadata/md5-cache/dev-java/asm-2.0-r2
index d24827d17580..90906eb8c94a 100644
--- a/metadata/md5-cache/dev-java/asm-2.0-r2
+++ b/metadata/md5-cache/dev-java/asm-2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/ant-owanttask:0 >=virtual/jre-1.6 >=dev-jav
 RESTRICT=test
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/asm/asm-2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c8f0d0fad5c98849028bddd23c8156a
diff --git a/metadata/md5-cache/dev-java/asm-2.2.3-r2 b/metadata/md5-cache/dev-java/asm-2.2.3-r2
index 3900644af6d3..2800a9f17631 100644
--- a/metadata/md5-cache/dev-java/asm-2.2.3-r2
+++ b/metadata/md5-cache/dev-java/asm-2.2.3-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/ant-owanttask:0 >=virtual/jre-1.6 >=dev-jav
 RESTRICT=test
 SLOT=2.2
 SRC_URI=http://download.forge.objectweb.org/asm/asm-2.2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=881e3a667d2ef31943f7b2e79525ef21
diff --git a/metadata/md5-cache/dev-java/asm-3.3.1-r1 b/metadata/md5-cache/dev-java/asm-3.3.1-r1
index db2d1b310518..59db16ff95d6 100644
--- a/metadata/md5-cache/dev-java/asm-3.3.1-r1
+++ b/metadata/md5-cache/dev-java/asm-3.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=3
 SRC_URI=http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2912df240d608b31ee72643aaf8cd44
diff --git a/metadata/md5-cache/dev-java/asm-4.0-r1 b/metadata/md5-cache/dev-java/asm-4.0-r1
index 1fa685eec952..43b0b0049b0a 100644
--- a/metadata/md5-cache/dev-java/asm-4.0-r1
+++ b/metadata/md5-cache/dev-java/asm-4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=398fbbf164153e36a3b0ea1d041f19db
diff --git a/metadata/md5-cache/dev-java/asm-5.0.3 b/metadata/md5-cache/dev-java/asm-5.0.3
index e547db6f711a..9a6ea770f3e9 100644
--- a/metadata/md5-cache/dev-java/asm-5.0.3
+++ b/metadata/md5-cache/dev-java/asm-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-5.0.3.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4d90a1739c9fd1ab4fdd55d99e24024
diff --git a/metadata/md5-cache/dev-java/asm-5.0.4 b/metadata/md5-cache/dev-java/asm-5.0.4
index 2761ae55dab7..2a3f7dc02c83 100644
--- a/metadata/md5-cache/dev-java/asm-5.0.4
+++ b/metadata/md5-cache/dev-java/asm-5.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=4
 SRC_URI=http://download.forge.objectweb.org/asm/asm-5.0.4.tar.gz http://download.forge.objectweb.org/asm/asm-4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3fd8e6679b4dd4d284ddc4a8b08ab5c7
diff --git a/metadata/md5-cache/dev-java/aspectj-1.7.3-r1 b/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
index e2574a41b0b9..2184bebff434 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
+++ b/metadata/md5-cache/dev-java/aspectj-1.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.5 dev-java/asm:4 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> aspectj-1.7.3.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=88eeaf294a53e5ca4956acb3ec0b3c08
diff --git a/metadata/md5-cache/dev-java/aspectj-1.7.4 b/metadata/md5-cache/dev-java/aspectj-1.7.4
index 1468943795e8..19121f1f85b5 100644
--- a/metadata/md5-cache/dev-java/aspectj-1.7.4
+++ b/metadata/md5-cache/dev-java/aspectj-1.7.4
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/asm:4 dev-java/commons-logging:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.4-src.jar&r=1 -> aspectj-1.7.4-src.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84c79bca29307da8a0c01713e39011b
diff --git a/metadata/md5-cache/dev-java/assertj-core-2.3.0 b/metadata/md5-cache/dev-java/assertj-core-2.3.0
index 44f3389a6223..18ac6fd9841d 100644
--- a/metadata/md5-cache/dev-java/assertj-core-2.3.0
+++ b/metadata/md5-cache/dev-java/assertj-core-2.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/junit:4 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/joel-costigliola/assertj-core/archive/assertj-core-2.3.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=12f68be4eb6a560816c3b212f11b60e9
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1 b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
index 8c93baf53d3b..73828e426be6 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b07b2f1f4a2ae51f0b319f7ae9b9d4a6
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2 b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
index 358f8d7047c3..9c93d139d176 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.1.5.src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9bab12b3381e3b9f3ac562b02d0673d
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
index a8359e0d63da..694ba04fbcb2 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 =dev-java/avalon-logkit-2* >=dev-java/log4j-1.2.9 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93e560c8f985025bb65d8068df130f18
diff --git a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2 b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
index 411f1c96af5d..b466dc52aefe 100644
--- a/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
+++ b/metadata/md5-cache/dev-java/avalon-framework-4.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/avalon-logkit:2.0 dev-java/log4j:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.2
 SRC_URI=mirror://apache/avalon/avalon-framework/source/avalon-framework-4.2.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e452f79e737147f31fee79e60d17ef2c
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1 b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
index e90b269daa08..a7ec0571e0e4 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
+++ b/metadata/md5-cache/dev-java/avalon-logkit-1.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/avalon-framework:4.1 dev-java/log4j:0 java-virtuals/jaf:0 java-virtuals/javamail:0 java-virtuals/jms:0 java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://apache/avalon/logkit/source/logkit-1.2.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a79dc11dd785cb04e92b65eaa953d8a
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r5 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r5
index 21680d1d7ce8..d685ad449814 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r5
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/log4j java-virtuals/jms java-virtuals/javamail =dev-java/servletapi-2.4* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=57da1d8ca729aecd44631cfed0fe6712
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r6 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r6
index a58d1c2078ac..563cbb61857d 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r6
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/log4j:0 java-virtuals/jms:0 java-virtuals/javamail:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0faf40ef9806814cef63b3a1ad4a96b0
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r7 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r7
index 4653df143715..6996d6322214 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r7
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/log4j:0 java-virtuals/jms:0 java-virtuals/javamail:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d24ce20f78f8662d85329cc00cc807b
diff --git a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8 b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
index eabfd03d2740..74a11980edaa 100644
--- a/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
+++ b/metadata/md5-cache/dev-java/avalon-logkit-2.1-r8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/log4j:0 java-virtuals/jms:0 dev-java/oracle-javamail:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=mirror://apache/excalibur/excalibur-logkit/source/avalon-logkit-2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c0769f432151c6ebcb15814a0fef993
diff --git a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
index 970e7589417c..2da5e435985c 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d3dd6db99d0e45e50bef03f39becfe1
diff --git a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
index e0a03e38c9b3..5885da32261c 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6161d81373c58efd65591269cb6899b
diff --git a/metadata/md5-cache/dev-java/balloontip-1.2.1 b/metadata/md5-cache/dev-java/balloontip-1.2.1
index ade9001a5942..7ebee6a3e896 100644
--- a/metadata/md5-cache/dev-java/balloontip-1.2.1
+++ b/metadata/md5-cache/dev-java/balloontip-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/balloontip/downloads/download/balloontip_1.2.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35b93edd5d260b9ce00b39f86967deee
diff --git a/metadata/md5-cache/dev-java/batik-1.8-r3 b/metadata/md5-cache/dev-java/batik-1.8-r3
index 91d14def002d..33977ace541f 100644
--- a/metadata/md5-cache/dev-java/batik-1.8-r3
+++ b/metadata/md5-cache/dev-java/batik-1.8-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 python? ( dev-java/jython:2.7 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0
 SLOT=1.8
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=561ad215ba6f67e6040ee434d2b70d95
diff --git a/metadata/md5-cache/dev-java/bcel-5.2-r2 b/metadata/md5-cache/dev-java/bcel-5.2-r2
index 65c0532773a5..b1a4a39721b1 100644
--- a/metadata/md5-cache/dev-java/bcel-5.2-r2
+++ b/metadata/md5-cache/dev-java/bcel-5.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/bcel/source/bcel-5.2-src.tar.gz findbugs? ( https://dev.gentoo.org/~fordfrog/distfiles/findbugs-bcel-5.2_p20070531.patch.bz2 )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cec28d68abb986187606b259e77ab38a
diff --git a/metadata/md5-cache/dev-java/bcel-5.2-r3 b/metadata/md5-cache/dev-java/bcel-5.2-r3
index 12ddd7df1d2d..32b3abf8f1df 100644
--- a/metadata/md5-cache/dev-java/bcel-5.2-r3
+++ b/metadata/md5-cache/dev-java/bcel-5.2-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/bcel/source/bcel-5.2-src.tar.gz findbugs? ( https://dev.gentoo.org/~fordfrog/distfiles/findbugs-bcel-5.2_p20070531.patch.bz2 )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dedd6ade8a9f9832d01d21d3dbaec65
diff --git a/metadata/md5-cache/dev-java/bcel-6.0_rc3 b/metadata/md5-cache/dev-java/bcel-6.0_rc3
index a0576b0abc77..efb709471e05 100644
--- a/metadata/md5-cache/dev-java/bcel-6.0_rc3
+++ b/metadata/md5-cache/dev-java/bcel-6.0_rc3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/apache/commons-bcel/archive/BCEL_6_0_RC3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20cbfc984d19e3ea792861820880fdcb
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r4 b/metadata/md5-cache/dev-java/bcmail-1.38-r4
index d786a13b48fd..1a7295162677 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.38-r4
+++ b/metadata/md5-cache/dev-java/bcmail-1.38-r4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.38 dev-java/junit:0 dev-java/sun-jaf:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.38
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2447b4d3f0772bd9e0aef7ffcb5a871b
diff --git a/metadata/md5-cache/dev-java/bcmail-1.38-r5 b/metadata/md5-cache/dev-java/bcmail-1.38-r5
index 7632270bc033..b49eb6681233 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.38-r5
+++ b/metadata/md5-cache/dev-java/bcmail-1.38-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.38 dev-java/junit:0 java-virtuals/jaf:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.38
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk14-138.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=562228e4a479195e01ecba294e8e2c6b
diff --git a/metadata/md5-cache/dev-java/bcmail-1.45-r3 b/metadata/md5-cache/dev-java/bcmail-1.45-r3
index 69383daf974a..df299300de1a 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.45-r3
+++ b/metadata/md5-cache/dev-java/bcmail-1.45-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.45 dev-java/junit:0 dev-java/sun-jaf:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.45
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15-145.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=803fe554377c837d47c3928ac4f06194
diff --git a/metadata/md5-cache/dev-java/bcmail-1.45-r4 b/metadata/md5-cache/dev-java/bcmail-1.45-r4
index 8965e0dd8aff..cd73f56ea155 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.45-r4
+++ b/metadata/md5-cache/dev-java/bcmail-1.45-r4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.45 dev-java/junit:0 java-virtuals/jaf:0 dev-java/oracle-javamail:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.45
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15-145.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ca763fa3d0f8a905acd9384cd545305
diff --git a/metadata/md5-cache/dev-java/bcmail-1.50-r2 b/metadata/md5-cache/dev-java/bcmail-1.50-r2
index c20866d62420..4c024494029f 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.50-r2
+++ b/metadata/md5-cache/dev-java/bcmail-1.50-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.50 dev-java/bcpkix:1.50 java-virtual
 RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-150.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=013317ce536a4220f792c9c8b675346d
diff --git a/metadata/md5-cache/dev-java/bcmail-1.52-r2 b/metadata/md5-cache/dev-java/bcmail-1.52-r2
index aeab70f1697e..a8b5831b6899 100644
--- a/metadata/md5-cache/dev-java/bcmail-1.52-r2
+++ b/metadata/md5-cache/dev-java/bcmail-1.52-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.52 dev-java/bcpkix:1.52 dev-java/jun
 RESTRICT=test
 SLOT=1.52
 SRC_URI=http://www.bouncycastle.org/download/bcmail-jdk15on-152.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73127fb030cde2cbba591319f58ebfca
diff --git a/metadata/md5-cache/dev-java/bcpg-1.50-r1 b/metadata/md5-cache/dev-java/bcpg-1.50-r1
index ab862871dc17..d00848eb64ad 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.50-r1
+++ b/metadata/md5-cache/dev-java/bcpg-1.50-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.50 >=dev-java/java-config-2.2.0 sour
 RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcpg-jdk15on-150.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=060b6e838e4f0fb9dde6fec9ea27d1f5
diff --git a/metadata/md5-cache/dev-java/bcpg-1.52-r1 b/metadata/md5-cache/dev-java/bcpg-1.52-r1
index 804f1ae1e886..f7f251eb6225 100644
--- a/metadata/md5-cache/dev-java/bcpg-1.52-r1
+++ b/metadata/md5-cache/dev-java/bcpg-1.52-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0 sour
 RESTRICT=test
 SLOT=1.52
 SRC_URI=http://www.bouncycastle.org/download/bcpg-jdk15on-152.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14447d28e8e5ba74b48a4541d3879dc0
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.50-r2 b/metadata/md5-cache/dev-java/bcpkix-1.50-r2
index 8674486f8b04..049aa0b8a3f5 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.50-r2
+++ b/metadata/md5-cache/dev-java/bcpkix-1.50-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.50 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.50
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.50/bcpkix-jdk15on-1.50-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9e33230edf8786bc7feca140f442d222
diff --git a/metadata/md5-cache/dev-java/bcpkix-1.52-r1 b/metadata/md5-cache/dev-java/bcpkix-1.52-r1
index b777f7ec2760..1be6c770d350 100644
--- a/metadata/md5-cache/dev-java/bcpkix-1.52-r1
+++ b/metadata/md5-cache/dev-java/bcpkix-1.52-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcprov:1.52 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.52
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.52/bcpkix-jdk15on-1.52-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=698074d40e4e27c667d70d0a2dc3cec5
diff --git a/metadata/md5-cache/dev-java/bcprov-1.38-r4 b/metadata/md5-cache/dev-java/bcprov-1.38-r4
index 89efffd3e6c6..f59d9b413816 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.38-r4
+++ b/metadata/md5-cache/dev-java/bcprov-1.38-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.38
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.38/bcprov-jdk16-1.38-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcf116965a2ce70f86318d2d1dc4d25b
diff --git a/metadata/md5-cache/dev-java/bcprov-1.40-r2 b/metadata/md5-cache/dev-java/bcprov-1.40-r2
index 8189be605710..13783ff16946 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.40-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.40-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.40
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.40/bcprov-jdk16-1.40-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4bc76662193f234941be95b83a199bb
diff --git a/metadata/md5-cache/dev-java/bcprov-1.45-r2 b/metadata/md5-cache/dev-java/bcprov-1.45-r2
index b51285382356..089db1dfb254 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.45-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.45-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.45
 SRC_URI=http://central.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d518b4f8d718466eb00c8c74c74b0d70
diff --git a/metadata/md5-cache/dev-java/bcprov-1.48-r2 b/metadata/md5-cache/dev-java/bcprov-1.48-r2
index a1ecf33e1742..7c08157216bb 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.48-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.48-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.48
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-148.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5124cb2137076428d391d8e59eca5e51
diff --git a/metadata/md5-cache/dev-java/bcprov-1.49-r4 b/metadata/md5-cache/dev-java/bcprov-1.49-r4
index ccc94767995d..17a764f22941 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.49-r4
+++ b/metadata/md5-cache/dev-java/bcprov-1.49-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.49
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-149.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3adb43f833ee18f24cc78dd04c23b9f1
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r2 b/metadata/md5-cache/dev-java/bcprov-1.50-r2
index 3b9831bc143c..90573219e481 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.50-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e99d3a3c6e0e5a4148543a25540b35e9
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r3 b/metadata/md5-cache/dev-java/bcprov-1.50-r3
index e4b9844f7674..3018b10521d8 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r3
+++ b/metadata/md5-cache/dev-java/bcprov-1.50-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d2a6e75322048eaa67c9eb268cf1576
diff --git a/metadata/md5-cache/dev-java/bcprov-1.50-r4 b/metadata/md5-cache/dev-java/bcprov-1.50-r4
index 2b8277e94c9c..1ec1822f9174 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.50-r4
+++ b/metadata/md5-cache/dev-java/bcprov-1.50-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.50
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-150.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07141bd0eef44708816d6c05a4f47606
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r1 b/metadata/md5-cache/dev-java/bcprov-1.52-r1
index ec2e3882b393..22bd05579d30 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r1
+++ b/metadata/md5-cache/dev-java/bcprov-1.52-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.52
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c6c56b88c0f1f1a950e02ab81d01af2
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r2 b/metadata/md5-cache/dev-java/bcprov-1.52-r2
index 7930014f784c..dd3763a7e4d9 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r2
+++ b/metadata/md5-cache/dev-java/bcprov-1.52-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=546e4a9c82f37dda51c139d983f508cf
diff --git a/metadata/md5-cache/dev-java/bcprov-1.52-r3 b/metadata/md5-cache/dev-java/bcprov-1.52-r3
index a8a8d1061485..383eb8fe1130 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.52-r3
+++ b/metadata/md5-cache/dev-java/bcprov-1.52-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.52
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-152.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a995e1adcc7c9d2e1db10edb703b925
diff --git a/metadata/md5-cache/dev-java/bcprov-1.54 b/metadata/md5-cache/dev-java/bcprov-1.54
index 9471d430d013..cbe7ddcba470 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.54
+++ b/metadata/md5-cache/dev-java/bcprov-1.54
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.54
 SRC_URI=http://www.bouncycastle.org/download/bcprov-jdk15on-154.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b650dd03bfd0b0247e0b8bef96c42d22
diff --git a/metadata/md5-cache/dev-java/bctsp-1.45-r1 b/metadata/md5-cache/dev-java/bctsp-1.45-r1
index 11f0d094dd2c..405ddc34a17b 100644
--- a/metadata/md5-cache/dev-java/bctsp-1.45-r1
+++ b/metadata/md5-cache/dev-java/bctsp-1.45-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/bcprov:1.45 dev-java/bcmail:1.45 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.bouncycastle.org/download/bctsp-jdk15-145.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f520bd73ed886b7a040a109c6318022
diff --git a/metadata/md5-cache/dev-java/beansbinding-1.2.1 b/metadata/md5-cache/dev-java/beansbinding-1.2.1
index 69be4429444d..90f692128955 100644
--- a/metadata/md5-cache/dev-java/beansbinding-1.2.1
+++ b/metadata/md5-cache/dev-java/beansbinding-1.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://beansbinding.dev.java.net/files/documents/6779/73673/beansbinding-1.2.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0cb739eca6f68a6af25e0c3cd4aff055
diff --git a/metadata/md5-cache/dev-java/beansbinding-1.2.1-r1 b/metadata/md5-cache/dev-java/beansbinding-1.2.1-r1
index 105616229e7c..ec0eba1d6905 100644
--- a/metadata/md5-cache/dev-java/beansbinding-1.2.1-r1
+++ b/metadata/md5-cache/dev-java/beansbinding-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://beansbinding.dev.java.net/files/documents/6779/73673/beansbinding-1.2.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fb07d565dc3180136e2b2838016d231
diff --git a/metadata/md5-cache/dev-java/beansbinding-1.2.1-r2 b/metadata/md5-cache/dev-java/beansbinding-1.2.1-r2
index a3e9428614eb..6cde45531100 100644
--- a/metadata/md5-cache/dev-java/beansbinding-1.2.1-r2
+++ b/metadata/md5-cache/dev-java/beansbinding-1.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/beansbinding-1.2.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=de7f6661c7b333a9ac7b60d934066c66
diff --git a/metadata/md5-cache/dev-java/blowfishj-2.14-r3 b/metadata/md5-cache/dev-java/blowfishj-2.14-r3
index 20e14cdd6281..ab24df09b477 100644
--- a/metadata/md5-cache/dev-java/blowfishj-2.14-r3
+++ b/metadata/md5-cache/dev-java/blowfishj-2.14-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/blowfishj/blowfishj-2.14-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7487e265cf3aa79fd989b3ebb53924d1
diff --git a/metadata/md5-cache/dev-java/bnd-junit-2.1.0 b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
index 6fbcb45499df..f7ef9c543ca8 100644
--- a/metadata/md5-cache/dev-java/bnd-junit-2.1.0
+++ b/metadata/md5-cache/dev-java/bnd-junit-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/bndlib:0 >=dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ca8e61f01a8a53c114b1d19adc33d3
diff --git a/metadata/md5-cache/dev-java/bndlib-2.1.0 b/metadata/md5-cache/dev-java/bndlib-2.1.0
index 9d0d67f7a9f3..9a3165011de6 100644
--- a/metadata/md5-cache/dev-java/bndlib-2.1.0
+++ b/metadata/md5-cache/dev-java/bndlib-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/libg:0 dev-java/osgi-compendium:0 dev-java/os
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1f9a393ef4b44c3a21b6f965c70df9c
diff --git a/metadata/md5-cache/dev-java/boilerpipe-1.2.0 b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
index 11f35c077948..ea2b97e00f98 100644
--- a/metadata/md5-cache/dev-java/boilerpipe-1.2.0
+++ b/metadata/md5-cache/dev-java/boilerpipe-1.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 dev-java/nekohtml:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://boilerpipe.googlecode.com/files/boilerpipe-1.2.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b2614732869bb2ff436ff1a7bb3cf5a
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
index dd3879468855..d1049f8dd995 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/browserlaunch2/BrowserLauncher2-all-1_3.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5aca025be193fd173f9105330d1217fd
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r2 b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
index 857611090c72..720c482d1dcc 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r2
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fef548462a9ad859dcfa02170a950c8b
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta4-r4 b/metadata/md5-cache/dev-java/bsh-2.0_beta4-r4
index 7550a1ef5281..629c2ad39c45 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta4-r4
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta4-r4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jdk-1.4 java-virtuals/servlet-api:3.0 readline? ( dev-java/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.beanshell.org/bsh-2.0b4-src.jar mirror://gentoo/beanshell-icon.png
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68de6a8aaa37e4748e342b22eb7c8b4d
diff --git a/metadata/md5-cache/dev-java/bytecode-20081007 b/metadata/md5-cache/dev-java/bytecode-20081007
index ac5fa907cfae..5aecb35224a2 100644
--- a/metadata/md5-cache/dev-java/bytecode-20081007
+++ b/metadata/md5-cache/dev-java/bytecode-20081007
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~serkan/distfiles/bytecode-20081007.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea639834844f91a272e44e2a11b16e9e
diff --git a/metadata/md5-cache/dev-java/bytelist-1.0.10 b/metadata/md5-cache/dev-java/bytelist-1.0.10
index 1031cd4d633c..8befdb3d5fc9 100644
--- a/metadata/md5-cache/dev-java/bytelist-1.0.10
+++ b/metadata/md5-cache/dev-java/bytelist-1.0.10
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jcodings:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jruby/bytelist/tarball/1.0.10 -> bytelist-1.0.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50c4327028396410ba4debced3bc4b18
diff --git a/metadata/md5-cache/dev-java/c3p0-0.9.5.1 b/metadata/md5-cache/dev-java/c3p0-0.9.5.1
index 27beaa08d04c..cbb61844cf5f 100644
--- a/metadata/md5-cache/dev-java/c3p0-0.9.5.1
+++ b/metadata/md5-cache/dev-java/c3p0-0.9.5.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-java/log4j:0 dev-java/mchange-commons:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/c3p0/c3p0-0.9.5.1.src.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a798b4e76f8bb781ed8314c3fa24b74
diff --git a/metadata/md5-cache/dev-java/cacao-0.99.4 b/metadata/md5-cache/dev-java/cacao-0.99.4
index 3befd544700a..b7841216a686 100644
--- a/metadata/md5-cache/dev-java/cacao-0.99.4
+++ b/metadata/md5-cache/dev-java/cacao-0.99.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) >=dev-java/java-config-2.2.0 >=dev-java/java-config-2.2.0 app-eselect/eselect-java
 SLOT=0
 SRC_URI=http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9da1f29b9ee9351557e476c1464e578
diff --git a/metadata/md5-cache/dev-java/cal10n-0.8.1 b/metadata/md5-cache/dev-java/cal10n-0.8.1
index 6df75d9cb1df..178d232bf8ec 100644
--- a/metadata/md5-cache/dev-java/cal10n-0.8.1
+++ b/metadata/md5-cache/dev-java/cal10n-0.8.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/ch/qos/cal10n/cal10n-api/0.8.1/cal10n-api-0.8.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc39969c97856df81f98d454878e7b98
diff --git a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1 b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
index b570cb4966bf..69dafffeb36d 100644
--- a/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
+++ b/metadata/md5-cache/dev-java/cdegroot-db-0.08-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.cdegroot.com/software/db/download/com.cdegroot.db-0.08.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=198917fbb6ee57bcdb92d335fbbe6648
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2 b/metadata/md5-cache/dev-java/cdi-api-1.2
index 8144933bae9b..758a2ae21d9a 100644
--- a/metadata/md5-cache/dev-java/cdi-api-1.2
+++ b/metadata/md5-cache/dev-java/cdi-api-1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/javax-inject:0 dev-java/glassfish-interceptor-api:0 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0ae36576ba71e812b8535fe3fd96747
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2-r1 b/metadata/md5-cache/dev-java/cdi-api-1.2-r1
index e36f85af71f4..b267943e0b34 100644
--- a/metadata/md5-cache/dev-java/cdi-api-1.2-r1
+++ b/metadata/md5-cache/dev-java/cdi-api-1.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/tomcat-servlet-api:3.0 dev-java/glassfish-interceptor-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar -> cdi-api-1.2.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=218633582e9c04446ef4bad4beb1ecc7
diff --git a/metadata/md5-cache/dev-java/cglib-3.1 b/metadata/md5-cache/dev-java/cglib-3.1
index dc2c26a8a958..a76516a9980c 100644
--- a/metadata/md5-cache/dev-java/cglib-3.1
+++ b/metadata/md5-cache/dev-java/cglib-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/asm:4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/cglib/cglib-src-3.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4fa52ed996902d7104c8dc8ccbcaca1a
diff --git a/metadata/md5-cache/dev-java/charva-1.1.4-r1 b/metadata/md5-cache/dev-java/charva-1.1.4-r1
index 60b9a60ddcb3..f9bcbadb02d6 100644
--- a/metadata/md5-cache/dev-java/charva-1.1.4-r1
+++ b/metadata/md5-cache/dev-java/charva-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 sys-libs/ncurses dev-java/commons-logging:0 >=dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/charva/charva/charva-1.1.4/charva.zip -> charva-1.1.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=214c4c875e3a375e3a0a3bfadd93a3ce
diff --git a/metadata/md5-cache/dev-java/classmate-0.9.0-r1 b/metadata/md5-cache/dev-java/classmate-0.9.0-r1
index fc46038a7a87..6c418834e204 100644
--- a/metadata/md5-cache/dev-java/classmate-0.9.0-r1
+++ b/metadata/md5-cache/dev-java/classmate-0.9.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-0.9.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f06eca22b87ff2c51be94f5344aaeeea
diff --git a/metadata/md5-cache/dev-java/classmate-1.0.0 b/metadata/md5-cache/dev-java/classmate-1.0.0
index c4a2438da267..1e69d29bdd29 100644
--- a/metadata/md5-cache/dev-java/classmate-1.0.0
+++ b/metadata/md5-cache/dev-java/classmate-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/cowtowncoder/java-classmate/archive/classmate-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f10a1aa113deff5ce00d97a24e04d676
diff --git a/metadata/md5-cache/dev-java/cldc-api-1.1-r1 b/metadata/md5-cache/dev-java/cldc-api-1.1-r1
index d02d8d86d321..9bc314a438dc 100644
--- a/metadata/md5-cache/dev-java/cldc-api-1.1-r1
+++ b/metadata/md5-cache/dev-java/cldc-api-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=mirror://gentoo/cldc-api-1.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=150271025e5701fa0095f4d8f7d99f31
diff --git a/metadata/md5-cache/dev-java/codemodel-2.6 b/metadata/md5-cache/dev-java/codemodel-2.6
index 072dab3cef8b..fa7ac7552ecd 100644
--- a/metadata/md5-cache/dev-java/codemodel-2.6
+++ b/metadata/md5-cache/dev-java/codemodel-2.6
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://repo.maven.apache.org/maven2/com/sun/codemodel/codemodel/2.6/codemodel-2.6-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bdc266768d10cd6503697faa81e1490
diff --git a/metadata/md5-cache/dev-java/cofoja-1.2 b/metadata/md5-cache/dev-java/cofoja-1.2
index 6c131a1e4560..92b46b2f12d7 100644
--- a/metadata/md5-cache/dev-java/cofoja-1.2
+++ b/metadata/md5-cache/dev-java/cofoja-1.2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nhatminhle/cofoja/archive/v1.2.zip -> cofoja-1.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f581e2ae01afedba88d8c4767e85129
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r3 b/metadata/md5-cache/dev-java/colt-1.2.0-r3
index 91ace9609edc..1efc14bc1ffd 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r3
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r3
@@ -9,5 +9,5 @@ LICENSE=colt
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=652cd16d84dd6801d0d2c3e16b756beb
diff --git a/metadata/md5-cache/dev-java/commons-beanutils-1.9.2 b/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
index e720d8b61379..4e78944f6afa 100644
--- a/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
+++ b/metadata/md5-cache/dev-java/commons-beanutils-1.9.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/commons/beanutils/source/commons-beanutils-1.9.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fdf1fc3e0fbd9d3adf9d42f345c6b41
diff --git a/metadata/md5-cache/dev-java/commons-betwixt-0.8 b/metadata/md5-cache/dev-java/commons-betwixt-0.8
index 63b9f9b5547b..c01446d2cd3f 100644
--- a/metadata/md5-cache/dev-java/commons-betwixt-0.8
+++ b/metadata/md5-cache/dev-java/commons-betwixt-0.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections:0 >=dev-java/commons-logging-1.0.2:0 dev-java/commons-beanutils:1.7 >=dev-java/commons-digester-1.6:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.7
 SRC_URI=mirror://apache/commons//betwixt/source/commons-betwixt-0.8-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54d7cccd05c1b72c56316064075b3fcf
diff --git a/metadata/md5-cache/dev-java/commons-chain-1.2 b/metadata/md5-cache/dev-java/commons-chain-1.2
index 9fddeaf92739..4658f4995ac4 100644
--- a/metadata/md5-cache/dev-java/commons-chain-1.2
+++ b/metadata/md5-cache/dev-java/commons-chain-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-digester:0 dev-java/mojarra:2.2 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/chain/source/commons-chain-1.2-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=11097db96ba44db58ec88e61e66036ed
diff --git a/metadata/md5-cache/dev-java/commons-cli-1.2 b/metadata/md5-cache/dev-java/commons-cli-1.2
index 956a13c8759c..29a601723cb3 100644
--- a/metadata/md5-cache/dev-java/commons-cli-1.2
+++ b/metadata/md5-cache/dev-java/commons-cli-1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/cli/source/commons-cli-1.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b074abc6b4fcd7dae10807cde01dc943
diff --git a/metadata/md5-cache/dev-java/commons-codec-1.7 b/metadata/md5-cache/dev-java/commons-codec-1.7
index 857896e42c90..bc8675bcd7c2 100644
--- a/metadata/md5-cache/dev-java/commons-codec-1.7
+++ b/metadata/md5-cache/dev-java/commons-codec-1.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/codec/source/commons-codec-1.7-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d02de811544bb3291c1565ee09b969c7
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1 b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
index 09b0029d18d8..183ab2937970 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 test-framework? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89ee2d603ec902bae708d46760171266
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.10 b/metadata/md5-cache/dev-java/commons-compress-1.10
index b74ac5f1f55a..5088bb7b5342 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.10
+++ b/metadata/md5-cache/dev-java/commons-compress-1.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xz-java:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.10-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0419db3dfc599b0f33d16243781a1208
diff --git a/metadata/md5-cache/dev-java/commons-compress-1.8.1-r1 b/metadata/md5-cache/dev-java/commons-compress-1.8.1-r1
index caed0a6af583..8e0c0973320e 100644
--- a/metadata/md5-cache/dev-java/commons-compress-1.8.1-r1
+++ b/metadata/md5-cache/dev-java/commons-compress-1.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/xz-java >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons//compress/source/commons-compress-1.8.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=30fe05ff9d76c6faefbe417e5db073b5
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2 b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
index 2422f1de57b4..786034fb9fcd 100644
--- a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
+++ b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/comm
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/configuration/source/commons-configuration-1.6-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ee560cbda8162aa82fee5b09c487cc3
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.15 b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
index ee3e1bafcdd9..d0116d7202e4 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.15
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.15
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a8990a19fb8a8275ed33232292b367c6
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.7 b/metadata/md5-cache/dev-java/commons-daemon-1.0.7
index 8d6a3ab338c3..6b9a74ab538e 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.7
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.7-src.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73e2de6e04d2f9ca33cca8fc33a55f13
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.0.9 b/metadata/md5-cache/dev-java/commons-daemon-1.0.9
index c9406d2afe37..260febeb3425 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.0.9
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.0.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=234fb00adcfc4be08c808b871d17166d
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-1.4-r2 b/metadata/md5-cache/dev-java/commons-dbcp-1.4-r2
index 4b10b4ab62b4..1bd3426b803a 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-1.4-r2
+++ b/metadata/md5-cache/dev-java/commons-dbcp-1.4-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-pool:0 java-virtuals/transaction-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ee93f3d36cb829bee32368f4890ef95
diff --git a/metadata/md5-cache/dev-java/commons-dbcp-2.1 b/metadata/md5-cache/dev-java/commons-dbcp-2.1
index d600bee21a57..c7d5128e0f7f 100644
--- a/metadata/md5-cache/dev-java/commons-dbcp-2.1
+++ b/metadata/md5-cache/dev-java/commons-dbcp-2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/commons-logging-1.1.1 dev-java/commons-pool:2 java-virtuals/transaction-api:0 dev-java/junit:4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/dbcp/source/commons-dbcp2-2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92460cea57656b64fe437df4bf3fb09d
diff --git a/metadata/md5-cache/dev-java/commons-dbutils-1.6 b/metadata/md5-cache/dev-java/commons-dbutils-1.6
index 555ce1086945..f97f6025f468 100644
--- a/metadata/md5-cache/dev-java/commons-dbutils-1.6
+++ b/metadata/md5-cache/dev-java/commons-dbutils-1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/dbutils/source/commons-dbutils-1.6-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eee36f70b1221238d099d67202ca4c2a
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2 b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
index 598530630914..e568c04d77dd 100644
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=34b71fe085fe4aafdd2465e6319097fd
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r1 b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
index 7f2e61a2e776..0c7618e0472a 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08afc865a9bf035e7c79ebb3b575313f
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r2 b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
index 729a1fb0bcff..a8bc97d302d6 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=881e187b8efaa2cdd2c5284117df9b88
diff --git a/metadata/md5-cache/dev-java/commons-discovery-0.4 b/metadata/md5-cache/dev-java/commons-discovery-0.4
index 7e57636fc732..6e771a867a21 100644
--- a/metadata/md5-cache/dev-java/commons-discovery-0.4
+++ b/metadata/md5-cache/dev-java/commons-discovery-0.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/discovery/source/commons-discovery-0.4-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e127e9bc0388b07b66dcfddd1659e0b8
diff --git a/metadata/md5-cache/dev-java/commons-el-1.0-r3 b/metadata/md5-cache/dev-java/commons-el-1.0-r3
index c8c52d441bcd..dcdded13d9f2 100644
--- a/metadata/md5-cache/dev-java/commons-el-1.0-r3
+++ b/metadata/md5-cache/dev-java/commons-el-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/el/source/commons-el-1.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a3d8d848e58923935f199fcf6c0a2a5
diff --git a/metadata/md5-cache/dev-java/commons-email-1.4 b/metadata/md5-cache/dev-java/commons-email-1.4
index 31cd87f8c819..91e3de552f03 100644
--- a/metadata/md5-cache/dev-java/commons-email-1.4
+++ b/metadata/md5-cache/dev-java/commons-email-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/oracle-javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/email/source/commons-email-1.4-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d154b39a9ab52bcea6346f969dd10564
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.3 b/metadata/md5-cache/dev-java/commons-fileupload-1.3
index 7632bfec4997..77a09fbb91b9 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.3
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.3-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7581fcf39f039770c906d983669088e0
diff --git a/metadata/md5-cache/dev-java/commons-graph-0.1 b/metadata/md5-cache/dev-java/commons-graph-0.1
index 24644abf7896..d033b2876e10 100644
--- a/metadata/md5-cache/dev-java/commons-graph-0.1
+++ b/metadata/md5-cache/dev-java/commons-graph-0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/commons-graph-0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05481f4d1fa900b89b791b47e97e0b8a
diff --git a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1 b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
index d1c0cc64927b..99bfedcf4c11 100644
--- a/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
+++ b/metadata/md5-cache/dev-java/commons-httpclient-3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-codec:0 >=
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://apache/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e3b2df63c5504578a2610a87be06a481
diff --git a/metadata/md5-cache/dev-java/commons-imaging-0.97 b/metadata/md5-cache/dev-java/commons-imaging-0.97
index 26a2d4c19f77..5ea37f91e498 100644
--- a/metadata/md5-cache/dev-java/commons-imaging-0.97
+++ b/metadata/md5-cache/dev-java/commons-imaging-0.97
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/sanselan/source/apache-sanselan-incubating-0.97-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fbcc05cb6952205552d113a17ca257a1
diff --git a/metadata/md5-cache/dev-java/commons-io-2.4 b/metadata/md5-cache/dev-java/commons-io-2.4
index f1d83121062c..0aa7a5ba5491 100644
--- a/metadata/md5-cache/dev-java/commons-io-2.4
+++ b/metadata/md5-cache/dev-java/commons-io-2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/commons/io/source/commons-io-2.4-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba880d7469d5c1261e17a8db9f62f4ae
diff --git a/metadata/md5-cache/dev-java/commons-jelly-1.0-r8 b/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
index 9419a3a8b764..b511109cd675 100644
--- a/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
+++ b/metadata/md5-cache/dev-java/commons-jelly-1.0-r8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/dom4j:1 dev-java/junit:0 dev-java/jaxen:1.1 dev-java/commons-cli:1 dev-java/commons-lang:0 dev-java/commons-jexl:1.0 dev-java/commons-logging:0 dev-java/commons-discovery:0 dev-java/commons-collections:0 dev-java/commons-beanutils:1.7 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/jakarta/commons/jelly/source/commons-jelly-1.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6b4720fd2464d897f9a38affe211db9
diff --git a/metadata/md5-cache/dev-java/commons-jexl-1.1-r1 b/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
index 3d39d004d9da..86971b7be7c2 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
+++ b/metadata/md5-cache/dev-java/commons-jexl-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://apache/jakarta/commons/jexl/source/commons-jexl-1.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=28c282ae347f416c4b09edac80b7dd21
diff --git a/metadata/md5-cache/dev-java/commons-jexl-2.1.1 b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
index a0aa034dcfbd..9c2265d40e66 100644
--- a/metadata/md5-cache/dev-java/commons-jexl-2.1.1
+++ b/metadata/md5-cache/dev-java/commons-jexl-2.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/jexl/source/commons-jexl-2.1.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2944ae6113284fde474206e69754406
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
index 742ca5fb540d..7528d67a5340 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 java-virtuals/servlet-api:2.5 dev-java/jdom:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bdc9ed9e4c4ab67bc0dee67e636dc59e
diff --git a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r2 b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r2
index 3f9f52d942a8..e1c351e8e236 100644
--- a/metadata/md5-cache/dev-java/commons-jxpath-1.3-r2
+++ b/metadata/md5-cache/dev-java/commons-jxpath-1.3-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 java-virtuals/servlet-api:2.5 dev-java/jdom:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/jxpath/source/commons-jxpath-1.3-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a674121883f6f038207b95a41a33de2
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.0-r2 b/metadata/md5-cache/dev-java/commons-lang-2.0-r2
index e88a7d26ef4a..c5aa3bbbb2ab 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.0-r2
+++ b/metadata/md5-cache/dev-java/commons-lang-2.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/lang/source/commons-lang-2.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75d9413fcfbff741c3a975d9b7d7ccc5
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.0-r3 b/metadata/md5-cache/dev-java/commons-lang-2.0-r3
index df4761d8d669..878a41555cd6 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.0-r3
+++ b/metadata/md5-cache/dev-java/commons-lang-2.0-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/lang/source/commons-lang-2.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3433f8132db9ae6383700dfe97d57daf
diff --git a/metadata/md5-cache/dev-java/commons-lang-2.6-r1 b/metadata/md5-cache/dev-java/commons-lang-2.6-r1
index 73ee1ebc9ae5..b0a6b7479fa3 100644
--- a/metadata/md5-cache/dev-java/commons-lang-2.6-r1
+++ b/metadata/md5-cache/dev-java/commons-lang-2.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang-2.6-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc24a686aea57141e75e2a42b7e8d21b
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.1 b/metadata/md5-cache/dev-java/commons-lang-3.1
index 935dfa9c9149..628d7680c9a3 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.1
+++ b/metadata/md5-cache/dev-java/commons-lang-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a66f591bda863b6648b7886225dd3122
diff --git a/metadata/md5-cache/dev-java/commons-lang-3.3.2 b/metadata/md5-cache/dev-java/commons-lang-3.3.2
index 82c52f1d7b2c..929cf7cd4499 100644
--- a/metadata/md5-cache/dev-java/commons-lang-3.3.2
+++ b/metadata/md5-cache/dev-java/commons-lang-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=ppc? ( test ) ppc64? ( test )
 SLOT=3.3
 SRC_URI=mirror://apache/commons/lang/source/commons-lang3-3.3.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=736fb59509562c91a7b85743a87cb7f2
diff --git a/metadata/md5-cache/dev-java/commons-launcher-1.1-r1 b/metadata/md5-cache/dev-java/commons-launcher-1.1-r1
index fdaed731ec07..3e2c09b6ab57 100644
--- a/metadata/md5-cache/dev-java/commons-launcher-1.1-r1
+++ b/metadata/md5-cache/dev-java/commons-launcher-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/launcher/source/commons-launcher-1.1-src.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2ce9e6041fbb57e7eaecdc4edde9129e
diff --git a/metadata/md5-cache/dev-java/commons-logging-1.2 b/metadata/md5-cache/dev-java/commons-logging-1.2
index fc5bf9b1e10f..51d0904790aa 100644
--- a/metadata/md5-cache/dev-java/commons-logging-1.2
+++ b/metadata/md5-cache/dev-java/commons-logging-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 avalon-logkit? ( dev-java/avalon-logkit:1.2 ) log4j? (
 RESTRICT=!servletapi? ( test )
 SLOT=0
 SRC_URI=mirror://apache/commons/logging/source/commons-logging-1.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e12dfb928fe86e81886c1469991121be
diff --git a/metadata/md5-cache/dev-java/commons-math-2.1-r1 b/metadata/md5-cache/dev-java/commons-math-2.1-r1
index 02827a9b2b12..0a1a5b7eef5e 100644
--- a/metadata/md5-cache/dev-java/commons-math-2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-math-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/math/source/commons-math-2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3dc035533b2ffa849a7a14279b88906
diff --git a/metadata/md5-cache/dev-java/commons-math-3.2 b/metadata/md5-cache/dev-java/commons-math-3.2
index 5d2a174b2862..ce9ecbfa5b0b 100644
--- a/metadata/md5-cache/dev-java/commons-math-3.2
+++ b/metadata/md5-cache/dev-java/commons-math-3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://apache/commons/math/source/commons-math3-3.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=088fd670aa3e23c956ad5a37abd47d91
diff --git a/metadata/md5-cache/dev-java/commons-net-1.4.1-r1 b/metadata/md5-cache/dev-java/commons-net-1.4.1-r1
index 60d31568a964..d0c105b50f9e 100644
--- a/metadata/md5-cache/dev-java/commons-net-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/commons-net-1.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/jakarta-oro-2.0.8-r2 >=dev-java/java-config
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/net/source/commons-net-1.4.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac7e3201a756a4c4fde38fefbef419ad
diff --git a/metadata/md5-cache/dev-java/commons-net-3.2 b/metadata/md5-cache/dev-java/commons-net-3.2
index 5c8731984536..da6b97f0415c 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.2
+++ b/metadata/md5-cache/dev-java/commons-net-3.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/net/source/commons-net-3.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f573101db81ea4fa5355814786191b5b
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.6 b/metadata/md5-cache/dev-java/commons-pool-1.6
index 5d33e209b157..f469d10bc616 100644
--- a/metadata/md5-cache/dev-java/commons-pool-1.6
+++ b/metadata/md5-cache/dev-java/commons-pool-1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/pool/source/commons-pool-1.6-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bebdb011c5e1e082b1408a351a099641
diff --git a/metadata/md5-cache/dev-java/commons-pool-2.2 b/metadata/md5-cache/dev-java/commons-pool-2.2
index ab5533d30e1a..91de410452c3 100644
--- a/metadata/md5-cache/dev-java/commons-pool-2.2
+++ b/metadata/md5-cache/dev-java/commons-pool-2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cglib:3 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/pool/source/commons-pool2-2.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e7aae0f87c3cfca2b4395c9aff33167
diff --git a/metadata/md5-cache/dev-java/commons-primitives-1.0-r2 b/metadata/md5-cache/dev-java/commons-primitives-1.0-r2
index a95fd6a2197f..3366564698f6 100644
--- a/metadata/md5-cache/dev-java/commons-primitives-1.0-r2
+++ b/metadata/md5-cache/dev-java/commons-primitives-1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/primitives/source/commons-primitives-1.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6756f1a2db2eecc5e27d1abb6d6586b3
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.4.0 b/metadata/md5-cache/dev-java/commons-validator-1.4.0
index cd2430e6cbe2..3ab648baf5b8 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.4.0
+++ b/metadata/md5-cache/dev-java/commons-validator-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=405207f362c1f4b6dff7673786000ef2
diff --git a/metadata/md5-cache/dev-java/commons-validator-1.4.1 b/metadata/md5-cache/dev-java/commons-validator-1.4.1
index 1b9f6765d80c..aeed17099324 100644
--- a/metadata/md5-cache/dev-java/commons-validator-1.4.1
+++ b/metadata/md5-cache/dev-java/commons-validator-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-digester-1.6:0 >=dev-java/commons-c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/commons/validator/source/commons-validator-1.4.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07dd4475243e807058539e0c155de521
diff --git a/metadata/md5-cache/dev-java/commons-vfs-1.0 b/metadata/md5-cache/dev-java/commons-vfs-1.0
index dd4052490a14..2b0e2570aa53 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-1.0
+++ b/metadata/md5-cache/dev-java/commons-vfs-1.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging dev-java/commons-net =dev-java/commons-httpclient-3* dev-java/jsch dev-java/commons-collections dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/commons/vfs/source/commons-vfs-1.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89af102f1a69077be39ab3fa9f1c0a2e
diff --git a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1 b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
index 5f29662a6b11..931ec480a84c 100644
--- a/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
+++ b/metadata/md5-cache/dev-java/commons-vfs-2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 dev-java/commons-httpclient:3 dev-java/jackrabbit-webdav:0 dev-java/jsch:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/commons/vfs/source/commons-vfs-2.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c4e59c3ffa1e03946e39f6760e7df82
diff --git a/metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1 b/metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1
index ff349fa8b7f0..0e4dbf3184f0 100644
--- a/metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1
+++ b/metadata/md5-cache/dev-java/concurrent-util-1.3.4-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain sun-concurrent-util MIT
 RDEPEND=>=virtual/jre-1.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-concurrent-util-1.3.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f338ec552d84f9b6c55b51a799840e2
diff --git a/metadata/md5-cache/dev-java/constantine-0.7-r1 b/metadata/md5-cache/dev-java/constantine-0.7-r1
index 085d8131ebd9..3e6444c5849f 100644
--- a/metadata/md5-cache/dev-java/constantine-0.7-r1
+++ b/metadata/md5-cache/dev-java/constantine-0.7-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/constantine-0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cc51a281e55dcb3d6122d808967a470
diff --git a/metadata/md5-cache/dev-java/cortado-0.6.0-r1 b/metadata/md5-cache/dev-java/cortado-0.6.0-r1
index 91706d54bd17..6eabfa8bf65f 100644
--- a/metadata/md5-cache/dev-java/cortado-0.6.0-r1
+++ b/metadata/md5-cache/dev-java/cortado-0.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea018f3e5c85b35a6f0fa75c0c97fc48
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
index 18061b4a0bda..75d4b4cf9347 100644
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
+++ b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 dev-java/xerces:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79737dc7c20cf6517a3316f01d9db2d5
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.18 b/metadata/md5-cache/dev-java/cssparser-0.9.18
index 5b92d5b1081f..ee8a131fb9ed 100644
--- a/metadata/md5-cache/dev-java/cssparser-0.9.18
+++ b/metadata/md5-cache/dev-java/cssparser-0.9.18
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.18-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3750113d636bae775cfccddb10690ab9
diff --git a/metadata/md5-cache/dev-java/db4o-jdk11-7.4 b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
index 64594d713d79..00f5811db6c2 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk11-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk11-7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk11-7.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05c70df7e4c1eacec58378e295b6e20b
diff --git a/metadata/md5-cache/dev-java/db4o-jdk12-7.4 b/metadata/md5-cache/dev-java/db4o-jdk12-7.4
index 8434a4d40b27..5360343e8d68 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk12-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk12-7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/db4o-jdk11 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk12-7.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b1e3c0507592467051bfde0ac7deb1a
diff --git a/metadata/md5-cache/dev-java/db4o-jdk5-7.4 b/metadata/md5-cache/dev-java/db4o-jdk5-7.4
index 3aaac850995d..caa24d4ed834 100644
--- a/metadata/md5-cache/dev-java/db4o-jdk5-7.4
+++ b/metadata/md5-cache/dev-java/db4o-jdk5-7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/db4o-jdk11 dev-java/db4o-jdk12 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/db4o-jdk5-7.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=45371b8b52f4a55109657695ff550bf3
diff --git a/metadata/md5-cache/dev-java/dbus-java-2.7-r1 b/metadata/md5-cache/dev-java/dbus-java-2.7-r1
index 7709fa01190f..8ddad3e71e0b 100644
--- a/metadata/md5-cache/dev-java/dbus-java-2.7-r1
+++ b/metadata/md5-cache/dev-java/dbus-java-2.7-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/libmatthew-java-0.7-r1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14664ac78a948c96e141676cb8010a11
diff --git a/metadata/md5-cache/dev-java/dict4j-1.1 b/metadata/md5-cache/dev-java/dict4j-1.1
index e8921af346e0..7cc579640365 100644
--- a/metadata/md5-cache/dev-java/dict4j-1.1
+++ b/metadata/md5-cache/dev-java/dict4j-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/dict4j/dict4j-1.1-src.jar -> dict4j-1.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=80fedce585f7a954d0ff7803d8b7a872
diff --git a/metadata/md5-cache/dev-java/disruptor-3.2.0 b/metadata/md5-cache/dev-java/disruptor-3.2.0
index d2ab8bd90ec6..b09cd7c66e20 100644
--- a/metadata/md5-cache/dev-java/disruptor-3.2.0
+++ b/metadata/md5-cache/dev-java/disruptor-3.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/lmax/disruptor/3.2.0/disruptor-3.2.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04c3c4bded3342e13cfa661df0babc96
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.6 b/metadata/md5-cache/dev-java/dnsjava-2.1.6
index 8a360726cea4..b35b03ce2d89 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.6
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5db9880e7c5d1921cf584816b61796d8
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.7 b/metadata/md5-cache/dev-java/dnsjava-2.1.7
index 596d508cc11c..433b95acdc04 100644
--- a/metadata/md5-cache/dev-java/dnsjava-2.1.7
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f658c0ff14388d2e530d590e03548914
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r5 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
index 34ddfc3c230c..c6a71c27a04f 100644
--- a/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r5
@@ -9,5 +9,5 @@ LICENSE=dom4j
 RDEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/jaxme:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78cec72581d98e00bb111e49e6bb8fba
diff --git a/metadata/md5-cache/dev-java/dom4j-1.6.1-r6 b/metadata/md5-cache/dev-java/dom4j-1.6.1-r6
new file mode 100644
index 000000000000..e2bdf5d1133f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/dom4j-1.6.1-r6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 test? ( dev-java/ant-junit:0 dev-java/junitperf:0 ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Java library for working with XML
+EAPI=5
+HOMEPAGE=http://dom4j.sourceforge.net/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=dom4j
+PDEPEND=dev-java/jaxen:1.1
+RDEPEND=dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=1
+SRC_URI=mirror://sourceforge/dom4j/dom4j-1.6.1.tar.gz mirror://gentoo/dom4j-1.6.1-java5.patch.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=5a2b61a3afbe2d155589496cd2b41f5f
diff --git a/metadata/md5-cache/dev-java/dsiutils-1.0.10-r2 b/metadata/md5-cache/dev-java/dsiutils-1.0.10-r2
index d4107c87546d..17d8c8a68aec 100644
--- a/metadata/md5-cache/dev-java/dsiutils-1.0.10-r2
+++ b/metadata/md5-cache/dev-java/dsiutils-1.0.10-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-java/commons-io:1 dev-java/jsap:0 dev-java/log4j:0 dev-java/commons-collections:0 dev-java/colt:0 dev-java/fastutil:5.0 dev-java/commons-configuration:0 dev-java/commons-lang:2.1 dev-java/junit:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dsiutils.dsi.unimi.it/dsiutils-1.0.10-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76e646365fefbf5c848192d611a55976
diff --git a/metadata/md5-cache/dev-java/dtdparser-1.21-r2 b/metadata/md5-cache/dev-java/dtdparser-1.21-r2
index 7e30bd20c4f9..6bc7c594eb6d 100644
--- a/metadata/md5-cache/dev-java/dtdparser-1.21-r2
+++ b/metadata/md5-cache/dev-java/dtdparser-1.21-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.21
 SRC_URI=http://www.wutka.com/download/dtdparser-1.21.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84f0942d7efb761b04cb54342b616eef
diff --git a/metadata/md5-cache/dev-java/dynalang-0.4-r1 b/metadata/md5-cache/dev-java/dynalang-0.4-r1
index 24169fffd256..257d55beec01 100644
--- a/metadata/md5-cache/dev-java/dynalang-0.4-r1
+++ b/metadata/md5-cache/dev-java/dynalang-0.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/dynalang/dynalang/dynalang-mop-0.4.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c525bf63910a707639914900fb1941cb
diff --git a/metadata/md5-cache/dev-java/easymock-3.3.1 b/metadata/md5-cache/dev-java/easymock-3.3.1
index 0bbf41959e55..18047867128e 100644
--- a/metadata/md5-cache/dev-java/easymock-3.3.1
+++ b/metadata/md5-cache/dev-java/easymock-3.3.1
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:4 dev-java/objenesis:0 dev-java/cglib:3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock/3.3.1/easymock-3.3.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=775527c247deda85979252fc5a9f1f84
diff --git a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1 b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
index a07508d2dc32..68b6487ea873 100644
--- a/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
+++ b/metadata/md5-cache/dev-java/easymock-classextension-3.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=virtual/jre-1.5 dev-java/easymock:3.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://sourceforge/easymock/EasyMock%20Class%20Extension/3.2/easymockclassextension-3.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=37dc9176fdf20ae47d43df5842ec9d31
diff --git a/metadata/md5-cache/dev-java/easyneurons-2.3 b/metadata/md5-cache/dev-java/easyneurons-2.3
index 0cb30e49b74c..a88e86854c92 100644
--- a/metadata/md5-cache/dev-java/easyneurons-2.3
+++ b/metadata/md5-cache/dev-java/easyneurons-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/colt:0 dev-java/appframework:0 dev-java/commons-collections:0 dev-java/absolutelayout:0 dev-java/jung:0 dev-java/xstream:0 ~dev-java/neuroph-2.3 dev-java/javahelp:0 dev-java/appframework:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50c5e3723fd08f07810536e50f3ff4c2
diff --git a/metadata/md5-cache/dev-java/echo2-2.1.1 b/metadata/md5-cache/dev-java/echo2-2.1.1
index 2f3bff04ebd2..b468fa86e49d 100644
--- a/metadata/md5-cache/dev-java/echo2-2.1.1
+++ b/metadata/md5-cache/dev-java/echo2-2.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=http://download.nextapp.com/downloads/echo2/2.1.1/NextApp_Echo2.tgz -> NextApp_Echo2-2.1.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c5351ee6fbfe63d623fc5b38ea4e52d
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3 b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
index 3b9444916271..dba35bc70647 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.5.2-r3
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0
 SLOT=3.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/ecjsrc-3.5.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c81fe4925a7a8d042b9f5dd06f6f2cf
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1 b/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
index bb012ed5ffb7..2f8e8f4ad995 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
+++ b/metadata/md5-cache/dev-java/ecj-gcj-3.6-r1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0
 SLOT=3.6
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a142d7abe4f3cc3504cffcbf0312110
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2 b/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
index 589d2593f517..5b40d9d4f98c 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f87b2095c2f6158a3d28c277d49b3274
diff --git a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2 b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
index 4aa70a1ff01a..dc16409ad10f 100644
--- a/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
+++ b/metadata/md5-cache/dev-java/ecj-gcj-4.4.2
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=sys-devel/gcc:*[gcj] app-eselect/eselect-java >=dev-java/java-config-2.2.0
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7b294d0f841a25080e8d936538a9abd
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
index 1e8373ea48e9..cd9a9e699e42 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.2.1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.2.1 )
 RDEPEND=app-eselect/eselect-java >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/ecjsrc-4.2.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c6519cdf779ddfe252f26545b22a47c2
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
index d269e8127598..aca7240fcc64 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.4.2-r1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.4.2 )
 RDEPEND=app-eselect/eselect-java >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.4.2-201502041700/ecjsrc-4.4.2.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=646fbedee96d68a15db782b5d80e7e4d
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
index 7e8b0edb46a5..ad658c687fcb 100644
--- a/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.5.1
@@ -10,5 +10,5 @@ PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.5.1 )
 RDEPEND=app-eselect/eselect-java >=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.5
 SRC_URI=http://download.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/ecjsrc-4.5.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd5475a1db41eb7554826fcabe8d55b3
diff --git a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713 b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
index a8bb7a3276f1..9339f123bd6c 100644
--- a/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
+++ b/metadata/md5-cache/dev-java/eclipsito-0_pre20130713
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/eclipsito-0_pre20130713.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=777bc1f43542996de26b9ad462d4d0a6
diff --git a/metadata/md5-cache/dev-java/ecs-1.4.2-r1 b/metadata/md5-cache/dev-java/ecs-1.4.2-r1
index 2ac07ce3f88a..9ca346e2aa98 100644
--- a/metadata/md5-cache/dev-java/ecs-1.4.2-r1
+++ b/metadata/md5-cache/dev-java/ecs-1.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/jakarta-regexp-1.3* >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/ecs/source/ecs-1.4.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04cb0f2881823c6c7c1dcc792fa69328
diff --git a/metadata/md5-cache/dev-java/ecs-1.4.2-r2 b/metadata/md5-cache/dev-java/ecs-1.4.2-r2
index 46b48219d6d4..0000413e3cf9 100644
--- a/metadata/md5-cache/dev-java/ecs-1.4.2-r2
+++ b/metadata/md5-cache/dev-java/ecs-1.4.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/jakarta-regexp:1.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/jakarta/ecs/source/ecs-1.4.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8830fce4fb85e059348271607f3c43a
diff --git a/metadata/md5-cache/dev-java/edtftpj-2.0.4 b/metadata/md5-cache/dev-java/edtftpj-2.0.4
index 40e56aada351..9054bdaadd3d 100644
--- a/metadata/md5-cache/dev-java/edtftpj-2.0.4
+++ b/metadata/md5-cache/dev-java/edtftpj-2.0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.enterprisedt.com/products/edtftpj/download/edtftpj-2.0.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a07608903b531b8fc5abd9fa8f54428
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r3 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
index 5e580635781f..d10a5cede5a2 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0792abb411e87d385726fca43e69b546
diff --git a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4 b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
index 4120c9f2bb85..061d1da9f569 100644
--- a/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
+++ b/metadata/md5-cache/dev-java/ehcache-1.2.4-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-collections:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/ehcache/ehcache-1.2.4.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a24afbb554ed0c2272884e30dbaa6eda
diff --git a/metadata/md5-cache/dev-java/emma-2.0.5312-r2 b/metadata/md5-cache/dev-java/emma-2.0.5312-r2
index 107145d5af97..645bd0dc99fa 100644
--- a/metadata/md5-cache/dev-java/emma-2.0.5312-r2
+++ b/metadata/md5-cache/dev-java/emma-2.0.5312-r2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 launcher? ( !sci-biology/emboss ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/emma/emma-2.0.5312-src.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b142f4d73482a545430d8b4adeedf89
diff --git a/metadata/md5-cache/dev-java/fastinfoset-1.2.11 b/metadata/md5-cache/dev-java/fastinfoset-1.2.11
index 0f02959c73f3..315a8b16c539 100644
--- a/metadata/md5-cache/dev-java/fastinfoset-1.2.11
+++ b/metadata/md5-cache/dev-java/fastinfoset-1.2.11
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/sun/xml/fastinfoset/FastInfoset/1.2.11/FastInfoset-1.2.11-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e98cf1139e19f5c6f2fbeb81db5395d
diff --git a/metadata/md5-cache/dev-java/fastutil-5.1.3 b/metadata/md5-cache/dev-java/fastutil-5.1.3
index 39129026feaf..cae195c01b65 100644
--- a/metadata/md5-cache/dev-java/fastutil-5.1.3
+++ b/metadata/md5-cache/dev-java/fastutil-5.1.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-5.1.3-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7e839f1243d8e7e8c5a6ef31b9abf0a
diff --git a/metadata/md5-cache/dev-java/fastutil-6.5.4 b/metadata/md5-cache/dev-java/fastutil-6.5.4
index b0976d86b403..9dacd86a9250 100644
--- a/metadata/md5-cache/dev-java/fastutil-6.5.4
+++ b/metadata/md5-cache/dev-java/fastutil-6.5.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=http://fastutil.dsi.unimi.it/fastutil-6.5.4-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6cec54fae601859367beacd989d6c29
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r2 b/metadata/md5-cache/dev-java/fec-1.0.4-r2
index de2a3bde7525..ca5b8bf384a1 100644
--- a/metadata/md5-cache/dev-java/fec-1.0.4-r2
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/log4j:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9e0551ca81d36fe65049401e4dfe53f9
diff --git a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6 b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
index 8461e244dc7a..56844b7a60c7 100644
--- a/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
+++ b/metadata/md5-cache/dev-java/felix-bundlerepository-1.6.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/kxml:2 dev-java/xpp3:0 dev-java/felix-shell:0 dev-java/felix-utils:0 dev-java/osgi-core-api:0 dev-java/osgi-obr:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.bundlerepository-1.6.6-source-release.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=047c2d921fd87087415fa9f020dd3d5b
diff --git a/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0 b/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
index d386ce51e653..066b53afeee9 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
+++ b/metadata/md5-cache/dev-java/felix-gogo-command-0.12.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/felix-bundlerepository:0 dev-java/felix-gogo-runtime:0 dev-java/osgi-compendium:0 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.command-0.12.0-project.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ddff1bbebc1443b951f0ad0ff18de9e
diff --git a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0 b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
index 26e86827a833..cb02051f962f 100644
--- a/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
+++ b/metadata/md5-cache/dev-java/felix-gogo-runtime-0.10.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.gogo.runtime-0.10.0-project.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea4f8bb624c84f36d03c32035a0025c6
diff --git a/metadata/md5-cache/dev-java/felix-shell-1.4.3 b/metadata/md5-cache/dev-java/felix-shell-1.4.3
index acd8e902d301..28b5850a5dad 100644
--- a/metadata/md5-cache/dev-java/felix-shell-1.4.3
+++ b/metadata/md5-cache/dev-java/felix-shell-1.4.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.shell-1.4.3-source-release.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91772ba61b884889fc82838ffa9191a4
diff --git a/metadata/md5-cache/dev-java/felix-utils-1.2.0 b/metadata/md5-cache/dev-java/felix-utils-1.2.0
index 6494395848f3..e03652143009 100644
--- a/metadata/md5-cache/dev-java/felix-utils-1.2.0
+++ b/metadata/md5-cache/dev-java/felix-utils-1.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/felix/org.apache.felix.utils-1.2.0-source-release.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=547e711dc1e30f882e2c68c27bddd8d7
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7-r2 b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
index a6c0b83564b1..ae4cb6bc183d 100644
--- a/metadata/md5-cache/dev-java/flyingsaucer-7-r2
+++ b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
@@ -10,5 +10,5 @@ RDEPEND=svg? ( >=virtual/jre-1.5 ) !svg? ( >=virtual/jre-1.4 ) >=dev-java/itext-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.pdoubleya.com/projects/flyingsaucer/downloads/r7/flyingsaucer-R7final-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dffeb93cbe2a9da43a032c058205f8a5
diff --git a/metadata/md5-cache/dev-java/fontbox-1.7.1 b/metadata/md5-cache/dev-java/fontbox-1.7.1
index a7f056344503..e0cfaf4a8af8 100644
--- a/metadata/md5-cache/dev-java/fontbox-1.7.1
+++ b/metadata/md5-cache/dev-java/fontbox-1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2e53965ba2885d3804e669170077d577
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r2 b/metadata/md5-cache/dev-java/fop-2.0-r2
index 46e06719e08c..8b767fac3edb 100644
--- a/metadata/md5-cache/dev-java/fop-2.0-r2
+++ b/metadata/md5-cache/dev-java/fop-2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.8 dev-java/ant-core:0 dev-java/fontbo
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a19ed696ea4fd9d598310b8a3601616f
diff --git a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1 b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
index a731ff8b4be9..28922f9362b7 100644
--- a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
+++ b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r1
@@ -9,5 +9,5 @@ LICENSE=Werken-1.1.1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6927a6e07b6de8aeff2c8387b7cc9865
diff --git a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2 b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
index e9dd34138a2e..160655c5f2ed 100644
--- a/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
+++ b/metadata/md5-cache/dev-java/forehead-1.0_beta5-r2
@@ -9,5 +9,5 @@ LICENSE=Werken-1.1.1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/forehead-1.0_beta5.tbz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65193548ece1bd6b5d6c3270c07c5b28
diff --git a/metadata/md5-cache/dev-java/freehep-export-2.1.1 b/metadata/md5-cache/dev-java/freehep-export-2.1.1
index 30cacb15399f..8fa3e1a94ede 100644
--- a/metadata/md5-cache/dev-java/freehep-export-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-export-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-swing-2.0.3 dev-java/freehep-misc-deps dev-java/freehep-util >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-export/2.1.1/freehep-export-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b5f4d0f6485f89acf4a5f1bf257f09a
diff --git a/metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1
index ca2f8f55eff6..a2e645e01664 100644
--- a/metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphics2d-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-util-2.0.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphics2d/2.1.1/freehep-graphics2d-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cec3ccd4dc1613c15088f8bacfa95cbf
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1
index 5bbafdec892f..68913f69eb66 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphics2d-2.1.1 dev-java/freehep-export dev-java/freehep-io dev-java/freehep-util dev-java/freehep-swing >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio/2.1.1/freehep-graphicsio-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b32578d1fdd9fc07b4b716e8bd67e37d
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1
index c999e774f3e1..6e2301dd68a3 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-util-2.0.2 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/jdom dev-java/junit dev-java/freehep-misc-deps dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-emf/2.1.1/freehep-graphicsio-emf-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=656171a929d3efabfa74f240e46d01e7
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1
index 56a09db1ccdb..5e46afafcdc6 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-java-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-java/2.1.1/freehep-graphicsio-java-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d9492b758578e530f86824babc668b3
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1
index bf60e7b0a511..4319b05aefa6 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-pdf-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-pdf/2.1.1/freehep-graphicsio-pdf-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ef43984c27482466e2ccc6a121d4704
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1
index a7385602a8fd..25c842d94fab 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-ps-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-ps/2.1.1/freehep-graphicsio-ps-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dd46f0c8b588db3f9b9b19a69123db0
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1
index 660c9d8364a6..499fe9e4ab5d 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-svg-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/freehep-xml >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-svg/2.1.1/freehep-graphicsio-svg-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5bbf44ee1156f9d1c0a95aa9be69131a
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1
index 3c3719127a4d..c25af990bded 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-swf-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-graphicsio-2.1.1 >=dev-java/freehep-graphicsio-tests-2.1.1 dev-java/junit dev-java/freehep-misc-deps dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-swf/2.1.1/freehep-graphicsio-swf-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=239b3185bc3ebc3f39df4941c75eb549
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1 b/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1
index 97a08786366f..fb4bead07f20 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-tests-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/freehep-export >=dev-java/freehep-graphicsio-2.1.1 dev-java/junit dev-java/freehep-misc-deps dev-java/freehep-util dev-java/freehep-swing dev-java/freehep-graphics2d dev-java/freehep-io dev-java/freehep-export >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-graphicsio-tests/2.1.1/freehep-graphicsio-tests-2.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a9800d327bf6291b8fb676ec393ee7c3
diff --git a/metadata/md5-cache/dev-java/freehep-io-2.0.2 b/metadata/md5-cache/dev-java/freehep-io-2.0.2
index a7d72a2b69a0..e57c714227e4 100644
--- a/metadata/md5-cache/dev-java/freehep-io-2.0.2
+++ b/metadata/md5-cache/dev-java/freehep-io-2.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-util-2.0.1 dev-java/junit >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-io/2.0.2/freehep-io-2.0.2-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7758030f00e66100b5744b395a892aec
diff --git a/metadata/md5-cache/dev-java/freehep-mcfio-2.0.1 b/metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
index 02eaf4f6f593..af26204cf99b 100644
--- a/metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
+++ b/metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-xdr-2.0.3 >=dev-java/junit-3.8.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-mcfio/2.0.1/freehep-mcfio-2.0.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=de6d5a923476ce2ac83601cc32a75c12
diff --git a/metadata/md5-cache/dev-java/freehep-misc-deps-0.1 b/metadata/md5-cache/dev-java/freehep-misc-deps-0.1
index 4b12473303e9..9e0cf6645640 100644
--- a/metadata/md5-cache/dev-java/freehep-misc-deps-0.1
+++ b/metadata/md5-cache/dev-java/freehep-misc-deps-0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/netbeans/openide-lookup/1.9-patched-1.0/openide-lookup-1.9-patched-1.0.jar http://java.freehep.org/maven2/org/freehep/jas-plotter/2.2.3/jas-plotter-2.2.3.jar http://java.freehep.org/maven2/hep/aida/aida/3.3/aida-3.3.jar http://java.freehep.org/maven2/hep/testdata/hbook/JAS/1.0/JAS-1.0.hbook http://java.freehep.org/maven2/hep/testdata/hbook/pawdemo/1.0/pawdemo-1.0.hbook http://java.freehep.org/maven2/hep/testdata/hbook/rowwise/1.0/rowwise-1.0.hbook
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f93a7200ba2911e4eba885c4534db9e6
diff --git a/metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0 b/metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0
index febd424d3e67..0f4a3b378c8f 100644
--- a/metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0
+++ b/metadata/md5-cache/dev-java/freehep-parameterdatabase-2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-swing-2.0.3 >=dev-java/freehep-xml-2.1.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-parameterdatabase/2.0/freehep-parameterdatabase-2.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=117f899fb03fc27e9a6132743de93ff1
diff --git a/metadata/md5-cache/dev-java/freehep-record-2.0 b/metadata/md5-cache/dev-java/freehep-record-2.0
index 5d2ba47941d6..0ff82b934c9d 100644
--- a/metadata/md5-cache/dev-java/freehep-record-2.0
+++ b/metadata/md5-cache/dev-java/freehep-record-2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/junit >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-record/2.0/freehep-record-2.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f55310057096837a38119fab05b4de40
diff --git a/metadata/md5-cache/dev-java/freehep-rootio-2.0.9 b/metadata/md5-cache/dev-java/freehep-rootio-2.0.9
index a2135cbdd402..5f178bb5c78f 100644
--- a/metadata/md5-cache/dev-java/freehep-rootio-2.0.9
+++ b/metadata/md5-cache/dev-java/freehep-rootio-2.0.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/bcel-5.2 dev-java/freehep-misc-deps >=dev-java/junit-3.8.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-rootio/2.0.9/freehep-rootio-2.0.9-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99ac4ad73ba5fae69593f632c69193fd
diff --git a/metadata/md5-cache/dev-java/freehep-rtti-2.0.1 b/metadata/md5-cache/dev-java/freehep-rtti-2.0.1
index 2d9a6a87197d..773ff1112e28 100644
--- a/metadata/md5-cache/dev-java/freehep-rtti-2.0.1
+++ b/metadata/md5-cache/dev-java/freehep-rtti-2.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/bcel >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-rtti/2.0.1/freehep-rtti-2.0.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=067166b6a62cf4e50749a2a96b6460e5
diff --git a/metadata/md5-cache/dev-java/freehep-sio-2.0 b/metadata/md5-cache/dev-java/freehep-sio-2.0
index 06afe852b44b..2034c25a6e17 100644
--- a/metadata/md5-cache/dev-java/freehep-sio-2.0
+++ b/metadata/md5-cache/dev-java/freehep-sio-2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-xdr-2.0.3 >=dev-java/junit-3.8.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-sio/2.0/freehep-sio-2.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b0b55069a1c0bbdbdb155acd08e8376
diff --git a/metadata/md5-cache/dev-java/freehep-stdhep-2.0.2 b/metadata/md5-cache/dev-java/freehep-stdhep-2.0.2
index 80899b4bae10..4571e4e948d9 100644
--- a/metadata/md5-cache/dev-java/freehep-stdhep-2.0.2
+++ b/metadata/md5-cache/dev-java/freehep-stdhep-2.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-mcfio-2.0.1 >=dev-java/junit-3.8.2 dev-java/freehep-xdr >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-stdhep/2.0.2/freehep-stdhep-2.0.2-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b04ec216ba83939f965354c17d88fd64
diff --git a/metadata/md5-cache/dev-java/freehep-swing-2.0.3 b/metadata/md5-cache/dev-java/freehep-swing-2.0.3
index 071428564e39..02c21dd6d485 100644
--- a/metadata/md5-cache/dev-java/freehep-swing-2.0.3
+++ b/metadata/md5-cache/dev-java/freehep-swing-2.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/junit >=dev-java/freehep-util-2.0.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-swing/2.0.3/freehep-swing-2.0.3-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0194ba7218adca8b42307701b33bd0be
diff --git a/metadata/md5-cache/dev-java/freehep-util-2.0.2 b/metadata/md5-cache/dev-java/freehep-util-2.0.2
index 0b7e03f32c88..b9e9cd218358 100644
--- a/metadata/md5-cache/dev-java/freehep-util-2.0.2
+++ b/metadata/md5-cache/dev-java/freehep-util-2.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/freehep-misc-deps dev-java/junit >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-util/2.0.2/freehep-util-2.0.2-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4a78e289d771efe01674086faf770ae
diff --git a/metadata/md5-cache/dev-java/freehep-xdr-2.0.3 b/metadata/md5-cache/dev-java/freehep-xdr-2.0.3
index 9a0c0c3aa47e..d46bb9a5ba89 100644
--- a/metadata/md5-cache/dev-java/freehep-xdr-2.0.3
+++ b/metadata/md5-cache/dev-java/freehep-xdr-2.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/junit-3.8.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-xdr/2.0.3/freehep-xdr-2.0.3-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f1ff934ee1d1829c1c0a8d8f2392e88
diff --git a/metadata/md5-cache/dev-java/freehep-xml-2.1.2 b/metadata/md5-cache/dev-java/freehep-xml-2.1.2
index 272e4e2afa24..1a2a1cde46e6 100644
--- a/metadata/md5-cache/dev-java/freehep-xml-2.1.2
+++ b/metadata/md5-cache/dev-java/freehep-xml-2.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/freehep-io-2.0.2 >=dev-java/freehep-util-2.0.2 >=dev-java/freehep-swing-2.0.3 dev-java/jdom dev-java/junit >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://java.freehep.org/maven2/org/freehep/freehep-xml/2.1.2/freehep-xml-2.1.2-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-mvn-src	19d8f1917a1c7f85669798d4a5bfb523	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4671eeff0e221f9f17de7a06afb7d998
diff --git a/metadata/md5-cache/dev-java/freemarker-2.3.13-r2 b/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
index 403629b91255..edfeb390bde2 100644
--- a/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
+++ b/metadata/md5-cache/dev-java/freemarker-2.3.13-r2
@@ -9,5 +9,5 @@ LICENSE=freemarker
 RDEPEND=dev-java/jython:2.7 java-virtuals/servlet-api:2.3 java-virtuals/servlet-api:2.4 java-virtuals/servlet-api:2.5 dev-java/jaxen:1.1 dev-java/juel:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://sourceforge/freemarker/freemarker-2.3.13.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f3cf2e6f4d39df06f738eb7cd57cefc
diff --git a/metadata/md5-cache/dev-java/fscript-1.17-r1 b/metadata/md5-cache/dev-java/fscript-1.17-r1
index ef96b9b38b15..dae5907fa022 100644
--- a/metadata/md5-cache/dev-java/fscript-1.17-r1
+++ b/metadata/md5-cache/dev-java/fscript-1.17-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/fscript/fscript-1.17.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b628ad1cf254961031619974c94aa622
diff --git a/metadata/md5-cache/dev-java/geoip-java-1.3.0 b/metadata/md5-cache/dev-java/geoip-java-1.3.0
index 89da6cde8978..8724578f1aa7 100644
--- a/metadata/md5-cache/dev-java/geoip-java-1.3.0
+++ b/metadata/md5-cache/dev-java/geoip-java-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoip-api-java/archive/v1.3.0.zip -> geoip-java-1.3.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ac782daebdd9e88d9d5c8ad36bf9831
diff --git a/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
index 1f355b5b0bde..77dbf5458617 100644
--- a/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-connector-api-1.1.2.2.04
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee238b79080253ad6b8220aef2047927
diff --git a/metadata/md5-cache/dev-java/glassfish-deployment-api-3.1.1 b/metadata/md5-cache/dev-java/glassfish-deployment-api-3.1.1
index e9f6742b0d0b..e6944f456273 100644
--- a/metadata/md5-cache/dev-java/glassfish-deployment-api-3.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-deployment-api-3.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=https://repo1.maven.org/maven2/org/glassfish/javax.enterprise.deploy/3.1.1/javax.enterprise.deploy-3.1.1-sources.jar -> glassfish-deployment-api-3.1.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae2fc6c0ff055f080b2894249126cc9d
diff --git a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2 b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
index f63e34e4e90e..d638b3a3cac8 100644
--- a/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
+++ b/metadata/md5-cache/dev-java/glassfish-ejb-api-3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 java-virtuals/xmlrpc-api:0 java-virtuals/transaction-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-ejb-api-3.2.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=511ce80e7d85b3812dff671525b0ee86
diff --git a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1 b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
index 5206a9dbb264..b9ab03781f3e 100644
--- a/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
+++ b/metadata/md5-cache/dev-java/glassfish-interceptor-api-3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-interceptor-api-3.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0fe442a71f556c16e045091240de96fe
diff --git a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
index f8aa84a71451..0ca123c3542c 100644
--- a/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-jms-api-1.1.2.2.04
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f61967eb9e1a497e250d3e5af1c5c2a
diff --git a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1 b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
index 38bf33759df3..f02586eaca66 100644
--- a/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
+++ b/metadata/md5-cache/dev-java/glassfish-persistence-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/fcs_branch/promoted/source/glassfish-9_0-b48-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f40348ed675561f45175229305fae738
diff --git a/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1 b/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1
index 789538827a19..85cfc9fdd97d 100644
--- a/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-servlet-api-3.1.1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1.1
 SRC_URI=http://central.maven.org/maven2/org/glassfish/javax.servlet/3.1.1/javax.servlet-3.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce7befe6428dc634ad94a3d1299733d2
diff --git a/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04 b/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
index 9d5afe59edc6..2c5040b6dbba 100644
--- a/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
+++ b/metadata/md5-cache/dev-java/glassfish-transaction-api-1.1.2.2.04
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2 )
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.java.net/javaee5/v2ur2/promoted/source/glassfish-v2ur2-b04-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cc7d4b71206c68facbc5af209e4fae4
diff --git a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1 b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
index 83a4827ed1fb..026cae1ce7b5 100644
--- a/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
+++ b/metadata/md5-cache/dev-java/glassfish-xmlrpc-api-1.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/glassfish-xmlrpc-api-1.1.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08f2420925b7afe899265f9390356335
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.7.0-r1 b/metadata/md5-cache/dev-java/glazedlists-1.7.0-r1
index 3aaf7dd3d84a..55d15157269a 100644
--- a/metadata/md5-cache/dev-java/glazedlists-1.7.0-r1
+++ b/metadata/md5-cache/dev-java/glazedlists-1.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://glazedlists.dev.java.net/files/documents/1073/38679/glazedlists-1.7.0-source_java15.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ec5447d02d6473442c105fa2b3f0bf3
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0 b/metadata/md5-cache/dev-java/glazedlists-1.8.0
index bcb7a96ce227..bfa365efdd81 100644
--- a/metadata/md5-cache/dev-java/glazedlists-1.8.0
+++ b/metadata/md5-cache/dev-java/glazedlists-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://java.net/downloads/glazedlists/glazedlists-1.8.0/glazedlists-1.8.0-source_java15.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d20562793799a28fcd5a53cdbfed5a9b
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
index c28958db0cda..601b8c50ed2e 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
+++ b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dss
 REQUIRED_USE=doc? ( gjdoc )
 SLOT=0.98
 SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=569061aa4927f6a976199a7bb3fc1268
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3 b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
index 468ba0cad2ad..72f8fe9dd494 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
+++ b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2.0
 SLOT=1.0
 SRC_URI=mirror://gnu/classpath/inetlib-1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=283379de7a12ee8fec604045c24757d2
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3 b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
index 9ce488f3413c..5389a314481c 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
+++ b/metadata/md5-cache/dev-java/gnu-classpath-inetlib-1.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.3 >=dev-java/gnu-crypto-2.0.1 >=dev-java/java-config-2.2.0
 SLOT=1.1
 SRC_URI=mirror://gnu/classpath/inetlib-1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f648922a80c168ba122a6e746aada4a2
diff --git a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2 b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
index 92675b2afbba..d3832946a289 100644
--- a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
+++ b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=792c2dad0df5a6c14d0ef26050837551
diff --git a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3 b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
index 57dd3ea9acd3..a304f29a6d59 100644
--- a/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
+++ b/metadata/md5-cache/dev-java/gnu-crypto-2.0.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=400c4b5d5791da1294de05b05c970676
diff --git a/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r2 b/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r2
index ef6a206bbaaa..b78f19d34ad5 100644
--- a/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r2
+++ b/metadata/md5-cache/dev-java/gnu-hylafax-1.0.3-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/commons-cli:1 dev-java/oracle-javamail:0 dev-java/java-getopt:1 dev-java/log4j:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-hylafax/gnu-hylafax/1.0.3/gnu-hylafax-1.0.3-bin.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd0b50c146fb0b03eab2163e474805ac
diff --git a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1 b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
index 4fef6b121b1e..dd2044f5d65b 100644
--- a/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
+++ b/metadata/md5-cache/dev-java/gnu-jaf-1.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/activation-1.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1a34c9c4128e9a1df1f1a2b9073d5ef
diff --git a/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2 b/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
index 967aeaed19d2..9598e9414dfe 100644
--- a/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
+++ b/metadata/md5-cache/dev-java/gnu-javamail-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 =dev-java/gnu-jaf-1* =dev-java/gnu-classpath-inetlib-1.0* !<=dev-java/mx4j-3.0.1 !<=dev-java/mx4j-3.0.1-r2 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://gnu/classpathx/mail-1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d74cdfac2ec4c13a7e714c7cb94ca10c
diff --git a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2 b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
index 403daaf171e1..4ca878747058 100644
--- a/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
+++ b/metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=ftp://ftp.tralfamadore.com/pub/java/gnu.regexp-1.1.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f72baa93b56d9a32c85fc4a96cca046
diff --git a/metadata/md5-cache/dev-java/groovy-1.7.5 b/metadata/md5-cache/dev-java/groovy-1.7.5
index 1bc079b09ba3..1bb14f904d19 100644
--- a/metadata/md5-cache/dev-java/groovy-1.7.5
+++ b/metadata/md5-cache/dev-java/groovy-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 !<dev-java/groovy-1.6.3 >=dev-java/asm-3.2 >=dev-java/
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.groovy.codehaus.org/distributions/groovy-src-1.7.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9b98c05f6e7e5952109ab205970a34cd
diff --git a/metadata/md5-cache/dev-java/groovy-1.8.5-r1 b/metadata/md5-cache/dev-java/groovy-1.8.5-r1
index 11513e8be743..9bbd4fe362db 100644
--- a/metadata/md5-cache/dev-java/groovy-1.8.5-r1
+++ b/metadata/md5-cache/dev-java/groovy-1.8.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/asm-3.2:3 >=dev-java/ant-core-1.8.0:0 >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.groovy.codehaus.org/distributions/groovy-src-1.8.5.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe6b8c4d66646fdc8103ee67f65850fe
diff --git a/metadata/md5-cache/dev-java/groovy-2.4.5 b/metadata/md5-cache/dev-java/groovy-2.4.5
index 06a7048bc709..509e38f54b45 100644
--- a/metadata/md5-cache/dev-java/groovy-2.4.5
+++ b/metadata/md5-cache/dev-java/groovy-2.4.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jansi:0 dev-java/xstream:0 dev-java/commons-cli:1 >=dev-java/asm-5.0.3:4 >=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/apache/incubator-groovy/archive/GROOVY_2_4_5.zip -> groovy-2.4.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9cb12974996bddc743696de495957f2
diff --git a/metadata/md5-cache/dev-java/gson-2.3.1 b/metadata/md5-cache/dev-java/gson-2.3.1
index 50058c5e8f38..e95051856647 100644
--- a/metadata/md5-cache/dev-java/gson-2.3.1
+++ b/metadata/md5-cache/dev-java/gson-2.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2.2
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/code/gson/gson/2.3.1/gson-2.3.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9beec6309af0cf44c410937cb591faf8
diff --git a/metadata/md5-cache/dev-java/guava-07 b/metadata/md5-cache/dev-java/guava-07
index 8d1dfee98a3b..e421745e2595 100644
--- a/metadata/md5-cache/dev-java/guava-07
+++ b/metadata/md5-cache/dev-java/guava-07
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://guava-libraries.googlecode.com/files/guava-r07.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f639752a7c0f01ea4ea2522425f06b44
diff --git a/metadata/md5-cache/dev-java/guava-13.0.1 b/metadata/md5-cache/dev-java/guava-13.0.1
index 9b1b3cd249e9..1d39ea71f096 100644
--- a/metadata/md5-cache/dev-java/guava-13.0.1
+++ b/metadata/md5-cache/dev-java/guava-13.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=13
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/13.0.1/guava-13.0.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d639b25ceda53ce88696b456bc6c4d64
diff --git a/metadata/md5-cache/dev-java/guava-13.0.1-r3 b/metadata/md5-cache/dev-java/guava-13.0.1-r3
index 4df320edf7ae..cc449464193e 100644
--- a/metadata/md5-cache/dev-java/guava-13.0.1-r3
+++ b/metadata/md5-cache/dev-java/guava-13.0.1-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 virtual/jre:1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=13
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/13.0.1/guava-13.0.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8ccd3a1d2085ef2842e73501744b089
diff --git a/metadata/md5-cache/dev-java/guava-14.0.1 b/metadata/md5-cache/dev-java/guava-14.0.1
index 46bb9e4ba7cd..f1aa2703f4b0 100644
--- a/metadata/md5-cache/dev-java/guava-14.0.1
+++ b/metadata/md5-cache/dev-java/guava-14.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=14
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/14.0.1/guava-14.0.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f020c653efe07463594efd3aa64dc91
diff --git a/metadata/md5-cache/dev-java/guava-15.0 b/metadata/md5-cache/dev-java/guava-15.0
index ce878271263b..73389c7af1ab 100644
--- a/metadata/md5-cache/dev-java/guava-15.0
+++ b/metadata/md5-cache/dev-java/guava-15.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=15
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0/guava-15.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14bda81ffc1446f61368bf2047531ee4
diff --git a/metadata/md5-cache/dev-java/guava-16.0.1 b/metadata/md5-cache/dev-java/guava-16.0.1
index 017923dd950e..af3e17e6b7aa 100644
--- a/metadata/md5-cache/dev-java/guava-16.0.1
+++ b/metadata/md5-cache/dev-java/guava-16.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=16
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/16.0.1/guava-16.0.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4f0cd2c82ae19e1abd228d8f00dd6d0
diff --git a/metadata/md5-cache/dev-java/guava-17.0 b/metadata/md5-cache/dev-java/guava-17.0
index 3685fbe1df88..10985fd28277 100644
--- a/metadata/md5-cache/dev-java/guava-17.0
+++ b/metadata/md5-cache/dev-java/guava-17.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=17
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/17.0/guava-17.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=88c03218289696eef6c1f0eb7deff655
diff --git a/metadata/md5-cache/dev-java/guava-18.0 b/metadata/md5-cache/dev-java/guava-18.0
index 6d680e964c9e..d584af00a74e 100644
--- a/metadata/md5-cache/dev-java/guava-18.0
+++ b/metadata/md5-cache/dev-java/guava-18.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=18
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/18.0/guava-18.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=39c5e091a72a9b4ca734fe263efec32a
diff --git a/metadata/md5-cache/dev-java/guice-2.0-r1 b/metadata/md5-cache/dev-java/guice-2.0-r1
index da0633643262..b3636403dd30 100644
--- a/metadata/md5-cache/dev-java/guice-2.0-r1
+++ b/metadata/md5-cache/dev-java/guice-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( virtual/jre:1.6 virtual/jre:1.7 ) dev-java/aopalliance:1 dev-java/a
 RESTRICT=test
 SLOT=2
 SRC_URI=https://google-guice.googlecode.com/files/guice-2.0-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b25c4ab12437fbd3e6e40e476a56316
diff --git a/metadata/md5-cache/dev-java/guice-4.0 b/metadata/md5-cache/dev-java/guice-4.0
index 49ca5501b0ea..f67abf0ddca3 100644
--- a/metadata/md5-cache/dev-java/guice-4.0
+++ b/metadata/md5-cache/dev-java/guice-4.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/aopalliance:1 dev-java/asm:4 dev-java/guava:1
 RESTRICT=test
 SLOT=4
 SRC_URI=https://github.com/google/guice/archive/4.0.tar.gz -> guice-4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=996c4caa0cbc1a9e1688c9832f875633
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.1 b/metadata/md5-cache/dev-java/hamcrest-core-1.1
index 73e18883acc0..a425e3b79b94 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7f6cfb79c0f50f4e40892e06cbf1db5
diff --git a/metadata/md5-cache/dev-java/hamcrest-core-1.3 b/metadata/md5-cache/dev-java/hamcrest-core-1.3
index 1111be9ebe93..4647e195c4a0 100644
--- a/metadata/md5-cache/dev-java/hamcrest-core-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-core-1.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=500d1c18d9aca0e8ad19dcffb6d959a3
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
index d98f6d112bab..a3162221bbc9 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3132bd8221f09d245efb6fec0e47f86c
diff --git a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1 b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
index 2d715be183aa..29638810e6de 100644
--- a/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-generator-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/qdox-1.12-r1:1.12 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca938e5e8e8d0e1f1d102badb72db55b
diff --git a/metadata/md5-cache/dev-java/hamcrest-integration-1.3 b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
index 6063ccdb2fa7..2f25232022f8 100644
--- a/metadata/md5-cache/dev-java/hamcrest-integration-1.3
+++ b/metadata/md5-cache/dev-java/hamcrest-integration-1.3
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 dev-java/qdox:1.6 dev-java/easymock:3.2 dev-java/jmock:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdf107f49786a60ec8a2d479c1c4dcbd
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1 b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
index 01e3d31a6151..6846cdfa8857 100644
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
+++ b/metadata/md5-cache/dev-java/hamcrest-library-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-generator:1.3 dev-java/hamcrest-core:1.3 dev-java/qdox:1.12 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.3.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9aed00472da2cc8a5330b6913f9356a3
diff --git a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10 b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
index c8640bc552ba..4c1eb7d2f026 100644
--- a/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
+++ b/metadata/md5-cache/dev-java/hawtjni-runtime-1.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/hawtjni/archive/hawtjni-project-1.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=527bc0a8f864652915fe4b782f5f8090
diff --git a/metadata/md5-cache/dev-java/headius-options-1.1 b/metadata/md5-cache/dev-java/headius-options-1.1
index 1bc2ab9436cd..6f00373b3f24 100644
--- a/metadata/md5-cache/dev-java/headius-options-1.1
+++ b/metadata/md5-cache/dev-java/headius-options-1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/headius/options/archive/options-1.1.tar.gz -> headius-options-1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61c3614169a8db1e64a42872d839b7cb
diff --git a/metadata/md5-cache/dev-java/helpgui-1.1-r2 b/metadata/md5-cache/dev-java/helpgui-1.1-r2
index ce3309da81bb..150f782ccdf1 100644
--- a/metadata/md5-cache/dev-java/helpgui-1.1-r2
+++ b/metadata/md5-cache/dev-java/helpgui-1.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/helpgui/helpgui-1.1-src.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=769f2adad2384fa0539c58f1d6566dff
diff --git a/metadata/md5-cache/dev-java/hessian-4.0.37 b/metadata/md5-cache/dev-java/hessian-4.0.37
index ac0576c9cb17..489c532cc1be 100644
--- a/metadata/md5-cache/dev-java/hessian-4.0.37
+++ b/metadata/md5-cache/dev-java/hessian-4.0.37
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=http://hessian.caucho.com/download/hessian-4.0.37-src.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7b85c16e84d64d221155c48a9675da4
diff --git a/metadata/md5-cache/dev-java/higlayout-1.0-r2 b/metadata/md5-cache/dev-java/higlayout-1.0-r2
index 4aa645380cff..fcf41fb1158f 100644
--- a/metadata/md5-cache/dev-java/higlayout-1.0-r2
+++ b/metadata/md5-cache/dev-java/higlayout-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.autel.cz/dmi/HIGLayout1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=25806f790b477b90b167a9e8910b49b3
diff --git a/metadata/md5-cache/dev-java/hoteqn-4.0.0 b/metadata/md5-cache/dev-java/hoteqn-4.0.0
index cc9a8c4f2231..28caeb14c1be 100644
--- a/metadata/md5-cache/dev-java/hoteqn-4.0.0
+++ b/metadata/md5-cache/dev-java/hoteqn-4.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/hoteqn-4.0.0.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe1f4985f56d76f280f814d8a170586b
diff --git a/metadata/md5-cache/dev-java/hoteqn-4.0.0-r1 b/metadata/md5-cache/dev-java/hoteqn-4.0.0-r1
index 10a37c65fca7..dece20f0ade9 100644
--- a/metadata/md5-cache/dev-java/hoteqn-4.0.0-r1
+++ b/metadata/md5-cache/dev-java/hoteqn-4.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/hoteqn-4.0.0.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78f13504b2ca96ea059782494845f3b2
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.13 b/metadata/md5-cache/dev-java/htmlcleaner-2.13
index 6266e7c8f24d..433007a2b843 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.13
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.13
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jdom:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlcleaner/files/htmlcleaner-2.13-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c26f90f826a10d60de3db75d0c3960c
diff --git a/metadata/md5-cache/dev-java/htmlparser-1.4-r1 b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
index 30771a389e04..b14941afb6f0 100644
--- a/metadata/md5-cache/dev-java/htmlparser-1.4-r1
+++ b/metadata/md5-cache/dev-java/htmlparser-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=dev-java/icu4j:52 dev-java/jchardet:0 dev-java/xom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://about.validator.nu/htmlparser/htmlparser-1.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=444beebedbdf670a80fa9747a067d5e0
diff --git a/metadata/md5-cache/dev-java/htmlparser-org-1.6 b/metadata/md5-cache/dev-java/htmlparser-org-1.6
index 52b195c9433e..87d4810793dc 100644
--- a/metadata/md5-cache/dev-java/htmlparser-org-1.6
+++ b/metadata/md5-cache/dev-java/htmlparser-org-1.6
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/htmlparser/htmlparser1_6_20060610.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=efc922a9663c1b0c1d5a84e0ef93c849
diff --git a/metadata/md5-cache/dev-java/httpcomponents-client-4.5 b/metadata/md5-cache/dev-java/httpcomponents-client-4.5
index 69cfc67a3127..e76680820937 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-client-4.5
+++ b/metadata/md5-cache/dev-java/httpcomponents-client-4.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-junit:0 dev-java/easymock:3.2 dev-java/spymemcached:0 dev-java/osgi-core-api:0 dev-java/osgi-enterprise-api:0 dev-java/commons-codec:0 dev-java/commons-logging:0 dev-java/httpcomponents-core:4.4 dev-java/easymock-classextension:3.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.5
 SRC_URI=mirror://apache/httpcomponents/httpclient/source/httpcomponents-client-4.5-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35a943247b3f415f23cc0251885b49fa
diff --git a/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1 b/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
index b93d7b925d09..79ed7b5b3204 100644
--- a/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
+++ b/metadata/md5-cache/dev-java/httpcomponents-core-4.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=mirror://apache/httpcomponents/httpcore/source/httpcomponents-core-4.4.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d54317d120704bc0a4e658d5a11ab4f
diff --git a/metadata/md5-cache/dev-java/ical4j-1.0.5 b/metadata/md5-cache/dev-java/ical4j-1.0.5
index 39a4cd58df59..c3a710377efc 100644
--- a/metadata/md5-cache/dev-java/ical4j-1.0.5
+++ b/metadata/md5-cache/dev-java/ical4j-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/commons-codec:0 de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ical4j/ical4j-1.0.5-src.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c7bda9b9458acf4c331195ae548eba5
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2 b/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2
index ff076f2a5d37..00b2779a6ac2 100644
--- a/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.13.9-r2
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/freetype-2.3.5:2= >=media-libs/lcms-2.5 >=sys-libs/zlib-1.2
 RESTRICT=test
 SLOT=6
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea6-1.13.9.tar.xz https://java.net/downloads/openjdk6/openjdk-6-src-b37-11_nov_2015.tar.xz http://icedtea.classpath.org/download/drops/cacao/68fe50ac34ec.tar.gz -> icedtea-cacao-68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=decc61d505d65c10a0a6d2480ef4c999
diff --git a/metadata/md5-cache/dev-java/icedtea-7.2.6.4-r1 b/metadata/md5-cache/dev-java/icedtea-7.2.6.4-r1
index 6691c6c51d95..a5e8122f0869 100644
--- a/metadata/md5-cache/dev-java/icedtea-7.2.6.4-r1
+++ b/metadata/md5-cache/dev-java/icedtea-7.2.6.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=test
 SLOT=7
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-2.6.4.tar.xz http://icedtea.classpath.org/download/drops/icedtea7/2.6.4/openjdk.tar.bz2 -> icedtea-2.6-openjdk-4f1e498cad9c.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.4/corba.tar.bz2 -> icedtea-2.6-corba-2135da66cc53.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.4/jaxp.tar.bz2 -> icedtea-2.6-jaxp-bc6edb6c12a7.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.4/jaxws.tar.bz2 -> icedtea-2.6-jaxws-271b555de438.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.4/jdk.tar.bz2 -> icedtea-2.6-jdk-dc86038147b2.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.4/hotspot.tar.bz2 -> icedtea-2.6-hotspot-19d919ae5506.tar.bz2 http://icedtea.classpath.org/download/drops/icedtea7/2.6.4/langtools.tar.bz2 -> icedtea-2.6-langtools-fd0a34cb97b4.tar.bz2 http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.gz -> icedtea-cacao-c182f119eaad.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f5d9b219027763a13a82aa81f9894a0a
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
index 10df01f99a1c..b7914988ced4 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d01c2357cd803b386b53ba8147480439
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1
index b5ba38d44e2f..eb22ffd4af34 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=icedtea7? ( || ( dev-java/icedtea:7 dev-java/icedtea-bin:7 ) ) !icedtea7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.5.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-vm-2	ba3b22a014a6ebc7b43b7e1bba90b9e1	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=068db2d07611452dd826e6309b589f22
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
index 0b9b46ebf55e..a0b0943a3dec 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1ef8ec75176f077b5a25776461b5c703
diff --git a/metadata/md5-cache/dev-java/icu4j-4.0.1.1 b/metadata/md5-cache/dev-java/icu4j-4.0.1.1
index 69ea9bcd0a53..dac7c83e648f 100644
--- a/metadata/md5-cache/dev-java/icu4j-4.0.1.1
+++ b/metadata/md5-cache/dev-java/icu4j-4.0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=ia64? ( test ) x86-fbsd? ( test )
 SLOT=4
 SRC_URI=http://download.icu-project.org/files/icu4j/4.0.1.1/icu4j-4_0_1_1-src.jar doc? ( http://download.icu-project.org/files/icu4j/4.0.1.1/icu4j-4_0_1_1-docs.jar )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a57cd55edbab04b6ca83e25b570c30ba
diff --git a/metadata/md5-cache/dev-java/icu4j-4.4.2 b/metadata/md5-cache/dev-java/icu4j-4.4.2
index e4fa82dfec0c..7dcc158d8be7 100644
--- a/metadata/md5-cache/dev-java/icu4j-4.4.2
+++ b/metadata/md5-cache/dev-java/icu4j-4.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=ia64? ( test )
 SLOT=4.4
 SRC_URI=http://download.icu-project.org/files/icu4j/4.4.2/icu4j-4_4_2-src.jar doc? ( http://download.icu-project.org/files/icu4j/4.4.2/icu4j-4_4_2-docs.jar )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=542b07fe1d53b5e3ffa8a9fbd649f6a1
diff --git a/metadata/md5-cache/dev-java/icu4j-54.1.1 b/metadata/md5-cache/dev-java/icu4j-54.1.1
index 3352aebfe361..abee45998874 100644
--- a/metadata/md5-cache/dev-java/icu4j-54.1.1
+++ b/metadata/md5-cache/dev-java/icu4j-54.1.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=52
 SRC_URI=http://download.icu-project.org/files/icu4j/54.1.1/icu4j-54_1_1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c4ec40f1d680607b74fea4ce0fbe502
diff --git a/metadata/md5-cache/dev-java/icu4j-55.1 b/metadata/md5-cache/dev-java/icu4j-55.1
index 851e78df1cf0..f8eb2d753f7e 100644
--- a/metadata/md5-cache/dev-java/icu4j-55.1
+++ b/metadata/md5-cache/dev-java/icu4j-55.1
@@ -9,5 +9,5 @@ LICENSE=icu
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=55
 SRC_URI=http://download.icu-project.org/files/icu4j/55.1/icu4j-55_1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b3cad579fdef79e325754e7a97bcf8b
diff --git a/metadata/md5-cache/dev-java/idm-console-framework-1.1.7 b/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
index 34e53b9c2231..62e231433f1d 100644
--- a/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
+++ b/metadata/md5-cache/dev-java/idm-console-framework-1.1.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/jss:3.4 dev-java/ldapsdk:4.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://directory.fedoraproject.org/sources/idm-console-framework-1.1.7.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee5c985d9542b1c5d3ad325e0e640f09
diff --git a/metadata/md5-cache/dev-java/ini4j-0.5.1 b/metadata/md5-cache/dev-java/ini4j-0.5.1
index 0926a3fe4e41..1d71eae3e3c2 100644
--- a/metadata/md5-cache/dev-java/ini4j-0.5.1
+++ b/metadata/md5-cache/dev-java/ini4j-0.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/org/ini4j/ini4j/0.5.1/ini4j-0.5.1-sources.jar -> ini4j-0.5.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d3e91e0b49b1fde5102741b7038607d
diff --git a/metadata/md5-cache/dev-java/invokebinder-1.6 b/metadata/md5-cache/dev-java/invokebinder-1.6
index 249283015106..d722af0a669d 100644
--- a/metadata/md5-cache/dev-java/invokebinder-1.6
+++ b/metadata/md5-cache/dev-java/invokebinder-1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/headius/invokebinder/archive/invokebinder-1.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74e79e4c36c63f1b4f603b5a730614a3
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r3 b/metadata/md5-cache/dev-java/iso-relax-20050331-r3
index 74445682abc0..681be2c95a9c 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r3
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331-gentoo.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3438cafde6685c456fa949cc8c0726b
diff --git a/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1 b/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
index 4f90d6ac739f..fa935c15de1f 100644
--- a/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
+++ b/metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/codemodel:2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-buildtools/2.22/istack-commons-buildtools-2.22-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52da762493fe0b8b6199302c39317b7b
diff --git a/metadata/md5-cache/dev-java/istack-commons-runtime-2.22 b/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
index 47be044cc686..f6e619a2f728 100644
--- a/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
+++ b/metadata/md5-cache/dev-java/istack-commons-runtime-2.22
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-runtime/2.22/istack-commons-runtime-2.22-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f94b3cc30fca4426d12a0acde694203
diff --git a/metadata/md5-cache/dev-java/istack-commons-soimp-2.22 b/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
index 7028a939500c..6771b23600c2 100644
--- a/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
+++ b/metadata/md5-cache/dev-java/istack-commons-soimp-2.22
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/args4j:2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/istack/istack-commons-soimp/2.22/istack-commons-soimp-2.22-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4274ba3e6693dbc918a5abd9cb9795ef
diff --git a/metadata/md5-cache/dev-java/itext-2.1.5-r2 b/metadata/md5-cache/dev-java/itext-2.1.5-r2
index 3ed7cd33ec71..58e1596377a0 100644
--- a/metadata/md5-cache/dev-java/itext-2.1.5-r2
+++ b/metadata/md5-cache/dev-java/itext-2.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=dev-java/bcmail:1.45 dev-java/bcprov:1.45 rups? ( dev-java/dom4j:1 dev-java/pdf-renderer:0 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/itext/iText-src-2.1.5.tar.gz cjk? ( mirror://sourceforge/itext/iTextAsian.jar mirror://sourceforge/itext/iTextAsianCmaps.jar )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e27c0ebe338c762b88c5a483f3a14e78
diff --git a/metadata/md5-cache/dev-java/itext-5.5.4-r2 b/metadata/md5-cache/dev-java/itext-5.5.4-r2
index fe68f61a73e1..61057d4a7f1e 100644
--- a/metadata/md5-cache/dev-java/itext-5.5.4-r2
+++ b/metadata/md5-cache/dev-java/itext-5.5.4-r2
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=dev-java/bcmail:1.52 dev-java/bcpkix:1.52 dev-java/bcprov:1.52 dev-java/xml-security:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=5
 SRC_URI=mirror://sourceforge/itext/itext-5.5.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=770e0abae42b76a70015dfe2ea074c40
diff --git a/metadata/md5-cache/dev-java/j2ssh-0.2.9 b/metadata/md5-cache/dev-java/j2ssh-0.2.9
index 8412a187960c..647a5fc626f2 100644
--- a/metadata/md5-cache/dev-java/j2ssh-0.2.9
+++ b/metadata/md5-cache/dev-java/j2ssh-0.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sshtools/j2ssh-0.2.9-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf510bfb1eeb00c742ec5656edf4c469
diff --git a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1 b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
index ed60f09e3431..d5e1cc4f4994 100644
--- a/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
+++ b/metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/bndlib:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/jackrabbit/2.10.1/jackrabbit-2.10.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5946d2457d8c4a3b6c2942ef61ca0cc
diff --git a/metadata/md5-cache/dev-java/jackson-1.9.13 b/metadata/md5-cache/dev-java/jackson-1.9.13
index c095e0d70f10..4573ee3cc9b8 100644
--- a/metadata/md5-cache/dev-java/jackson-1.9.13
+++ b/metadata/md5-cache/dev-java/jackson-1.9.13
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/codehaus/jackson/jackson-core-lgpl/1.9.13/jackson-core-lgpl-1.9.13-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1b46dc8b4661e96f1959f4e9cee84f0
diff --git a/metadata/md5-cache/dev-java/jackson-2.5.1 b/metadata/md5-cache/dev-java/jackson-2.5.1
index cea8e6d1f1d7..7ed93286a600 100644
--- a/metadata/md5-cache/dev-java/jackson-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-2.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfce0dee15af5a1b3f6e1c1f7cfad9e9
diff --git a/metadata/md5-cache/dev-java/jackson-2.5.2 b/metadata/md5-cache/dev-java/jackson-2.5.2
index 0df1177760fc..19179aa44048 100644
--- a/metadata/md5-cache/dev-java/jackson-2.5.2
+++ b/metadata/md5-cache/dev-java/jackson-2.5.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-core/archive/jackson-core-2.5.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfce0dee15af5a1b3f6e1c1f7cfad9e9
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.5.1 b/metadata/md5-cache/dev-java/jackson-annotations-2.5.1
index 3b736d61ed6b..0bb85ff9a68e 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d7823778dbdaef269203d06864e0010
diff --git a/metadata/md5-cache/dev-java/jackson-annotations-2.5.2 b/metadata/md5-cache/dev-java/jackson-annotations-2.5.2
index 920a3178b889..eb19a6fd3995 100644
--- a/metadata/md5-cache/dev-java/jackson-annotations-2.5.2
+++ b/metadata/md5-cache/dev-java/jackson-annotations-2.5.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-annotations/archive/jackson-annotations-2.5.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d7823778dbdaef269203d06864e0010
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1 b/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
index 423cbe7045ed..9588108f6065 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.5.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-annotation
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8de864f34ba98bf703f6fd3baa4040c
diff --git a/metadata/md5-cache/dev-java/jackson-databind-2.5.2 b/metadata/md5-cache/dev-java/jackson-databind-2.5.2
index 0b17e612cdca..01aaa5f50ab4 100644
--- a/metadata/md5-cache/dev-java/jackson-databind-2.5.2
+++ b/metadata/md5-cache/dev-java/jackson-databind-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.2:2 ~dev-java/jackson-annotation
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-databind/archive/jackson-databind-2.5.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8de864f34ba98bf703f6fd3baa4040c
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1
index f8251fc8c6c5..64102d040752 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-annotation
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0221279b64dded65e706fbfabaf7b44f
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.2 b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.2
index e14b5b38d330..56cb876db57f 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.2
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-xml-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.2:2 ~dev-java/jackson-annotation
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-xml/archive/jackson-dataformat-xml-2.5.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0221279b64dded65e706fbfabaf7b44f
diff --git a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1 b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1
index 5f2db31bac01..5e2a0d179364 100644
--- a/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-dataformat-yaml-2.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-databind-2.5.1:2 >=dev-java/snakeyaml-1.16:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-dataformat-yaml/archive/jackson-dataformat-yaml-2.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=959d724bac12f0a2bc34a3c25f50ee36
diff --git a/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1 b/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1
index 8d269a415d21..03cce2e976ac 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1
+++ b/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.1:2 ~dev-java/jackson-annotations-2.5.1:2 ~dev-java/jackson-databind-2.5.1:2 dev-java/stax2-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-module-jaxb-annotations/archive/jackson-module-jaxb-annotations-2.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6e13d0ef50ccc950c7f9ad4c16224e8
diff --git a/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.2 b/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.2
index d0124010b12c..3912f572e11c 100644
--- a/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.2
+++ b/metadata/md5-cache/dev-java/jackson-module-jaxb-annotations-2.5.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 ~dev-java/jackson-2.5.2:2 ~dev-java/jackson-annotations-2.5.2:2 ~dev-java/jackson-databind-2.5.2:2 dev-java/stax2-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/FasterXML/jackson-module-jaxb-annotations/archive/jackson-module-jaxb-annotations-2.5.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6e13d0ef50ccc950c7f9ad4c16224e8
diff --git a/metadata/md5-cache/dev-java/jacl-1.4.1-r1 b/metadata/md5-cache/dev-java/jacl-1.4.1-r1
index 97b8422b74cb..d372bc978d50 100644
--- a/metadata/md5-cache/dev-java/jacl-1.4.1-r1
+++ b/metadata/md5-cache/dev-java/jacl-1.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.4.5:* >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tcljava/jacl1.4.1.tar.gz -> jacl-1.4.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc251373fc39b2c8b011eca79c551eff
diff --git a/metadata/md5-cache/dev-java/jacoco-0.7.5 b/metadata/md5-cache/dev-java/jacoco-0.7.5
index 23e1b6336aa9..78068c76ef0d 100644
--- a/metadata/md5-cache/dev-java/jacoco-0.7.5
+++ b/metadata/md5-cache/dev-java/jacoco-0.7.5
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=dev-java/ant-core:0 dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.jacoco.report-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-report.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.7.5.201505241946/org.jacoco.agent-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-agent.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.5.201505241946/org.jacoco.core-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-core.jar https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.7.5.201505241946/org.jacoco.ant-0.7.5.201505241946-sources.jar -> jacoco-0.7.5-ant.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cdab38de070a11cd4c44b582f2af871e
diff --git a/metadata/md5-cache/dev-java/jade-3.3-r1 b/metadata/md5-cache/dev-java/jade-3.3-r1
index d75a54e5a611..e27705a2c808 100644
--- a/metadata/md5-cache/dev-java/jade-3.3-r1
+++ b/metadata/md5-cache/dev-java/jade-3.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/JADE-src-3.3.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=849727dd909cb0df7289f3ff6197cad5
diff --git a/metadata/md5-cache/dev-java/jade-3.3-r2 b/metadata/md5-cache/dev-java/jade-3.3-r2
index cc58a066e874..0c67017929d9 100644
--- a/metadata/md5-cache/dev-java/jade-3.3-r2
+++ b/metadata/md5-cache/dev-java/jade-3.3-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/JADE-src-3.3.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe9ad937df78d94739f10f6691788521
diff --git a/metadata/md5-cache/dev-java/jaffl-0.5.11-r1 b/metadata/md5-cache/dev-java/jaffl-0.5.11-r1
index 7271cdb175ee..e7f9757c13ee 100644
--- a/metadata/md5-cache/dev-java/jaffl-0.5.11-r1
+++ b/metadata/md5-cache/dev-java/jaffl-0.5.11-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/asm:3 dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.5.11 -> jaffl-0.5.11.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b5c25b02f3b7b2efda11cf53691ccb0
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
index b2bb49077d3c..dc028e41d79c 100644
--- a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f606c8b20722b6f53ff15885f4f0f240
diff --git a/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r4 b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r4
new file mode 100644
index 000000000000..608e6a2605b9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=A set of text-processing Java classes
+EAPI=5
+HOMEPAGE=http://jakarta.apache.org/oro/index.html
+IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-1.1
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=2.0
+SRC_URI=http://archive.apache.org/dist/jakarta/oro/jakarta-oro-2.0.8.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=35494dda19cad57fd4cf6b36f47c972b
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4 b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4
index 5ec32462d6ce..10de92a558c0 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=1.3
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0545f6783b439a657c7c9ad9a2b262c
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5 b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
index 9cf7d4ff28c5..0a1e9276edc4 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae443f3a627bbfb0fca4a4cf2427813c
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1
index 154854ef2447..bb12ca2a8cec 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba1ffb21dd3a228a049d59cdd584cb18
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2 b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
index d6714ae9cdf4..38c5762640e3 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=mirror://apache/jakarta/regexp/source/jakarta-regexp-1.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edcffb491578c8c9d501df38877b0e89
diff --git a/metadata/md5-cache/dev-java/jakarta-regexp-1.5 b/metadata/md5-cache/dev-java/jakarta-regexp-1.5
index 97af027f66fa..1171e17f4a24 100644
--- a/metadata/md5-cache/dev-java/jakarta-regexp-1.5
+++ b/metadata/md5-cache/dev-java/jakarta-regexp-1.5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.5
 SRC_URI=http://archive.apache.org/dist/jakarta/regexp/jakarta-regexp-1.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=215e7e7706ca329f1ce8d9e53e7a7ede
diff --git a/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3 b/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3
index 53af625902f5..9b1cd645cd03 100644
--- a/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3
+++ b/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-httpclient:3 dev-java/jdom:1.0 dev-java/xml-im-exporter:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://archive.apache.org/dist/jakarta/slide/source/jakarta-slide-webdavclient-src-2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=651ecae47618e2434091d0ba3b236893
diff --git a/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r4 b/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r4
index a42edb66806b..c0673ec844d1 100644
--- a/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r4
+++ b/metadata/md5-cache/dev-java/jakarta-slide-webdavclient-2.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-httpclient:3 dev-java/jdom:0 dev-java/xml-im-exporter:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://archive.apache.org/dist/jakarta/slide/source/jakarta-slide-webdavclient-src-2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6352f2151de6406cc8401231bcc75fc5
diff --git a/metadata/md5-cache/dev-java/jal-20031117-r3 b/metadata/md5-cache/dev-java/jal-20031117-r3
index bcf7eb2d343a..859109513670 100644
--- a/metadata/md5-cache/dev-java/jal-20031117-r3
+++ b/metadata/md5-cache/dev-java/jal-20031117-r3
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://vigna.dsi.unimi.it/jal/jal-20031117-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ba33c6156e5f36cc28549df61334868
diff --git a/metadata/md5-cache/dev-java/jama-1.0.3-r1 b/metadata/md5-cache/dev-java/jama-1.0.3-r1
index 42bb61226902..55fbdb0f859e 100644
--- a/metadata/md5-cache/dev-java/jama-1.0.3-r1
+++ b/metadata/md5-cache/dev-java/jama-1.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://math.nist.gov/javanumerics/jama/Jama-1.0.3.tar.gz -> jama-1.0.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3003adb178e59bc588f1641485a12e5d
diff --git a/metadata/md5-cache/dev-java/jamon-1.01-r3 b/metadata/md5-cache/dev-java/jamon-1.01-r3
index 23250306ce9a..9ffe26269a72 100644
--- a/metadata/md5-cache/dev-java/jamon-1.01-r3
+++ b/metadata/md5-cache/dev-java/jamon-1.01-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.3 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://sourceforge/jamonapi/JAMonAll_103005.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0fd3c2dbb0d8c2cd8c4e40eb4a61337b
diff --git a/metadata/md5-cache/dev-java/janino-2.7.0 b/metadata/md5-cache/dev-java/janino-2.7.0
index e7e6e43fe9f3..56d8d788d246 100644
--- a/metadata/md5-cache/dev-java/janino-2.7.0
+++ b/metadata/md5-cache/dev-java/janino-2.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core:0 dev-java/unkrig-nullanalysis:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://janino.net/download/janino-2.7.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cab7a883ab5526e2b6d7ff05a89e5934
diff --git a/metadata/md5-cache/dev-java/jansi-1.11-r1 b/metadata/md5-cache/dev-java/jansi-1.11-r1
index 7c3e5a79c0d4..811b757f0ce7 100644
--- a/metadata/md5-cache/dev-java/jansi-1.11-r1
+++ b/metadata/md5-cache/dev-java/jansi-1.11-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.11
 SRC_URI=https://github.com/fusesource/jansi/tarball/jansi-project-1.11 -> jansi-1.11.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4133f37a00dce01fee08bc46a800dabb
diff --git a/metadata/md5-cache/dev-java/jansi-1.5 b/metadata/md5-cache/dev-java/jansi-1.5
index 82de1511b568..9c71a6208cc6 100644
--- a/metadata/md5-cache/dev-java/jansi-1.5
+++ b/metadata/md5-cache/dev-java/jansi-1.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-1.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=700a23c9739604b29072e95b99f1c6b0
diff --git a/metadata/md5-cache/dev-java/jansi-1.5-r1 b/metadata/md5-cache/dev-java/jansi-1.5-r1
index 479a21a60276..4455af41705f 100644
--- a/metadata/md5-cache/dev-java/jansi-1.5-r1
+++ b/metadata/md5-cache/dev-java/jansi-1.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi/archive/jansi-1.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6be686c95fdb5ad2fe3ded294667aa36
diff --git a/metadata/md5-cache/dev-java/jansi-native-1.5 b/metadata/md5-cache/dev-java/jansi-native-1.5
index 17623b00b4fb..8975d78397e3 100644
--- a/metadata/md5-cache/dev-java/jansi-native-1.5
+++ b/metadata/md5-cache/dev-java/jansi-native-1.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/hawtjni-runtime:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/fusesource/jansi-native/tarball/jansi-native-1.5 -> jansi-native-1.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b218f7c638a1ab3a256cc15039f8fee3
diff --git a/metadata/md5-cache/dev-java/japitools-0.9.7-r1 b/metadata/md5-cache/dev-java/japitools-0.9.7-r1
index 8b5a25b5343d..67384f1ed95f 100644
--- a/metadata/md5-cache/dev-java/japitools-0.9.7-r1
+++ b/metadata/md5-cache/dev-java/japitools-0.9.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.kaffe.org/~stuart/japi/japitools-0.9.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b22b717061c2490cd516a4eaa3c9608c
diff --git a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2 b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
index 752d21173df1..75a825c7f253 100644
--- a/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/jarbundler-1.8.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jarbundler/jarbundler-1.8.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1667939017fca2c247e9bd7e94e8280
diff --git a/metadata/md5-cache/dev-java/jarbundler-2.3.1 b/metadata/md5-cache/dev-java/jarbundler-2.3.1
index cbdf5cb42a6d..19bc202bdddc 100644
--- a/metadata/md5-cache/dev-java/jarbundler-2.3.1
+++ b/metadata/md5-cache/dev-java/jarbundler-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-java/xerces-2.8.1:2 >=virtual/jre-1.6 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/project/jarbundler/JarBundler/v2.3.1/jarbundler.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92df49493bcbb0b3d9179484d7bdd5a1
diff --git a/metadata/md5-cache/dev-java/jargs-1.0 b/metadata/md5-cache/dev-java/jargs-1.0
index 60bd7420807d..3448ccddb108 100644
--- a/metadata/md5-cache/dev-java/jargs-1.0
+++ b/metadata/md5-cache/dev-java/jargs-1.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jargs/jargs-1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bf33f2ef2064cdc33b30ce7e13ce2610
diff --git a/metadata/md5-cache/dev-java/jarjar-1.4 b/metadata/md5-cache/dev-java/jarjar-1.4
index 37c5107d968c..7bd26b0d9703 100644
--- a/metadata/md5-cache/dev-java/jarjar-1.4
+++ b/metadata/md5-cache/dev-java/jarjar-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/asm:4 dev-java/gnu-regexp:1 dev-java/java-getopt:1 dev-java/ant
 RESTRICT=test
 SLOT=1
 SRC_URI=https://jarjar.googlecode.com/files/jarjar-src-1.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7ec2961448e24f229a32aabac49a3c9
diff --git a/metadata/md5-cache/dev-java/java-dep-check-0.3-r1 b/metadata/md5-cache/dev-java/java-dep-check-0.3-r1
index 41bb72caef5b..0e30c9d170d5 100644
--- a/metadata/md5-cache/dev-java/java-dep-check-0.3-r1
+++ b/metadata/md5-cache/dev-java/java-dep-check-0.3-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli:1 dev-java/asm:3 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc124014d15e5b0ebf2a05c0ea9c30b5
diff --git a/metadata/md5-cache/dev-java/java-getopt-1.0.14 b/metadata/md5-cache/dev-java/java-getopt-1.0.14
index 21baaf4817bb..c2a0205b4b6f 100644
--- a/metadata/md5-cache/dev-java/java-getopt-1.0.14
+++ b/metadata/md5-cache/dev-java/java-getopt-1.0.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.14.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47a1b5386bc0021bdb42e97210899dbb
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.0.19 b/metadata/md5-cache/dev-java/java-gnome-4.0.19
index b17f0b2bda08..48adf9b07cad 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.0.19
+++ b/metadata/md5-cache/dev-java/java-gnome-4.0.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.22 >=x11-libs/gtk+-2.22.0:2 >=gnome-base/libglade-2.6.
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/java-gnome/4.0/java-gnome-4.0.19.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e86635627d9441fbd67f3c164a4d647
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.0.20 b/metadata/md5-cache/dev-java/java-gnome-4.0.20
index 400916a14e37..7105c57027b0 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.0.20
+++ b/metadata/md5-cache/dev-java/java-gnome-4.0.20
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.22 >=x11-libs/gtk+-2.22.0:2 >=gnome-base/libglade-2.6.
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/java-gnome/4.0/java-gnome-4.0.20.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd87415d858de86dd31adca3a15a6d17
diff --git a/metadata/md5-cache/dev-java/java-gnome-4.1.3 b/metadata/md5-cache/dev-java/java-gnome-4.1.3
index a4698b8cf6f4..ab74da8b5de6 100644
--- a/metadata/md5-cache/dev-java/java-gnome-4.1.3
+++ b/metadata/md5-cache/dev-java/java-gnome-4.1.3
@@ -10,5 +10,5 @@ RDEPEND=app-text/enchant:0 dev-libs/atk:0 >=dev-libs/glib-2.28:2 dev-libs/libuni
 RESTRICT=test
 SLOT=4.1
 SRC_URI=mirror://gnome/sources/java-gnome/4.1/java-gnome-4.1.3.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=8d8c090d18a682f848bc827380d40928
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
index d5071980b28b..b0391190d529 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
@@ -9,5 +9,5 @@ LICENSE=tanuki-community
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c5e277a2e10af07669e04748ebe8ab1
diff --git a/metadata/md5-cache/dev-java/javacc-5.0-r2 b/metadata/md5-cache/dev-java/javacc-5.0-r2
index 26671768d445..ebcce0bc1bd5 100644
--- a/metadata/md5-cache/dev-java/javacc-5.0-r2
+++ b/metadata/md5-cache/dev-java/javacc-5.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/junit:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/projects/javacc/downloads/download/javacc-5.0src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04268c1f76be5b0de0e8f3a8d3b46b83
diff --git a/metadata/md5-cache/dev-java/javacsv-2.1 b/metadata/md5-cache/dev-java/javacsv-2.1
index 3adf008c7d0d..b2148ae966af 100644
--- a/metadata/md5-cache/dev-java/javacsv-2.1
+++ b/metadata/md5-cache/dev-java/javacsv-2.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/javacsv/javacsv2.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=111cea26d4fe28418286282f0447137c
diff --git a/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608 b/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
index b2673eab6660..8affbe69781a 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
+++ b/metadata/md5-cache/dev-java/javacup-0.11a_beta20060608
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/javacup-0.11a_beta20060608.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18d4683c3f56368ff50513cf863cea15
diff --git a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001 b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
index 4ffe82f0108f..a82f3ca3c74e 100644
--- a/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
+++ b/metadata/md5-cache/dev-java/javacup-0.11b_p20151001
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-11b-20151001.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1371bf5c0db5b70759fac3467c40b739
diff --git a/metadata/md5-cache/dev-java/javahelp-2.0.05_p63 b/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
index cc553fbd9118..eaad8efb4f48 100644
--- a/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
+++ b/metadata/md5-cache/dev-java/javahelp-2.0.05_p63
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://javahelp.dev.java.net/files/documents/5985/145533/javahelp2-src-2.0.05_svn63.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0280d5c11cc638f36255030d81adcdeb
diff --git a/metadata/md5-cache/dev-java/javassist-2.6-r2 b/metadata/md5-cache/dev-java/javassist-2.6-r2
index 25cbe1a6091f..20f83605e502 100644
--- a/metadata/md5-cache/dev-java/javassist-2.6-r2
+++ b/metadata/md5-cache/dev-java/javassist-2.6-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/jboss/javassist-2.6.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3d9181ed3f0871006c749591d83ab02
diff --git a/metadata/md5-cache/dev-java/javassist-3.18.2 b/metadata/md5-cache/dev-java/javassist-3.18.2
index 249b7c4dbc19..01f1f1a44f4f 100644
--- a/metadata/md5-cache/dev-java/javassist-3.18.2
+++ b/metadata/md5-cache/dev-java/javassist-3.18.2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga_build.tar.gz -> javassist-3.18.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0a769e4a9226f88bb3302e4c14461b7
diff --git a/metadata/md5-cache/dev-java/javax-inject-1-r2 b/metadata/md5-cache/dev-java/javax-inject-1-r2
index 137fa3243c67..072a4d613954 100644
--- a/metadata/md5-cache/dev-java/javax-inject-1-r2
+++ b/metadata/md5-cache/dev-java/javax-inject-1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ab8a7315e5d41f0c4c8e5cd6f728839
diff --git a/metadata/md5-cache/dev-java/javolution-4.0.2-r1 b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
index c9c8a7339e63..881d43cc5011 100644
--- a/metadata/md5-cache/dev-java/javolution-4.0.2-r1
+++ b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=http://javolution.org/javolution-4.0.2-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb64563db442931acb475841651e8cac
diff --git a/metadata/md5-cache/dev-java/javolution-6.0.0 b/metadata/md5-cache/dev-java/javolution-6.0.0
index a3ed9c0c9211..52e00e0fa545 100644
--- a/metadata/md5-cache/dev-java/javolution-6.0.0
+++ b/metadata/md5-cache/dev-java/javolution-6.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/osgi-core-api:0 dev-java/osgi-compendium:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0.tar.xz https://dev.gentoo.org/~tomwij/files/dist/javolution-6.0.0-build.xml.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aabe8178c8b179f51bab86b9c8a31770
diff --git a/metadata/md5-cache/dev-java/jax-ws-2.0.1-r1 b/metadata/md5-cache/dev-java/jax-ws-2.0.1-r1
index bbb28bceadf5..fbc97468f22d 100644
--- a/metadata/md5-cache/dev-java/jax-ws-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/jax-ws-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/istack-commons-runtime:0 dev-java/jax-ws-api:2 dev-java/jaxb:2 dev-java/jsr173:0 >=dev-java/jsr181-1.0 dev-java/jsr250:0 dev-java/sun-httpserver-bin:2 dev-java/jsr67:0 dev-java/saaj:0 dev-java/sjsxp:0 dev-java/stax-ex:0 dev-java/sun-jaf:0 dev-java/txw2-runtime:0 dev-java/xmlstreambuffer:0 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09159b75741872b40ecee5be5ded1cd6
diff --git a/metadata/md5-cache/dev-java/jax-ws-api-2.0 b/metadata/md5-cache/dev-java/jax-ws-api-2.0
index 5214a3a6efa2..a2bac319fc4b 100644
--- a/metadata/md5-cache/dev-java/jax-ws-api-2.0
+++ b/metadata/md5-cache/dev-java/jax-ws-api-2.0
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr67 =dev-java/jaxb-2* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jax-ws.dev.java.net/files/documents/4202/34734/jaxws-api-fcs-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2c775e32ebf64a401c7bb04fc24fa88
diff --git a/metadata/md5-cache/dev-java/jaxb-2.1.2-r1 b/metadata/md5-cache/dev-java/jaxb-2.1.2-r1
index 3ce619135fbd..3741d844bd93 100644
--- a/metadata/md5-cache/dev-java/jaxb-2.1.2-r1
+++ b/metadata/md5-cache/dev-java/jaxb-2.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/istack-commons-runtime:0 dev-java/jsr173:0 java-virtuals/jaf dev-java/txw2-runtime:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://jaxb.dev.java.net/2.1.2/JAXB2_src_20070125.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e29a8b1a941dadb7497d52afb09ff84
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.1 b/metadata/md5-cache/dev-java/jaxen-1.1.1
index 72b92aedd683..22dec8da3d41 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.1
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.1
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 =dev-java/dom4j-1* dev-java/xom >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4e84d945aaad7b489a2c4ee86508291
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.4-r1 b/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
index 3e24b54d626c..e3d3a883959e 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.4-r1
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.4-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed0c5250b763638b59d04c82959bd549
diff --git a/metadata/md5-cache/dev-java/jaxen-1.1.6 b/metadata/md5-cache/dev-java/jaxen-1.1.6
index 94d093cb9fc5..55a4682a1b34 100644
--- a/metadata/md5-cache/dev-java/jaxen-1.1.6
+++ b/metadata/md5-cache/dev-java/jaxen-1.1.6
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://repo1.maven.org/maven2/jaxen/jaxen/1.1.6/jaxen-1.1.6-sources.jar -> jaxen-1.1.6.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=086151a7028ded4530053ca70b8cd15f
diff --git a/metadata/md5-cache/dev-java/jaxme-0.5.2-r2 b/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
index f605653b93b7..5864451aa726 100644
--- a/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
+++ b/metadata/md5-cache/dev-java/jaxme-0.5.2-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/xerces:2 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/log4j-1.2.8:0 dev-java/junit:0 dev-java/xmldb:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d6cd1edc5652252583d58ae7bb0998d4
diff --git a/metadata/md5-cache/dev-java/jaxp-1.4-r1 b/metadata/md5-cache/dev-java/jaxp-1.4-r1
index 1a528ceb1bed..08eecb0eefe8 100644
--- a/metadata/md5-cache/dev-java/jaxp-1.4-r1
+++ b/metadata/md5-cache/dev-java/jaxp-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jaxp-1.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=573799d2b99f6b2ac61f1a0ec42cd9e7
diff --git a/metadata/md5-cache/dev-java/jaxr-1.0.6-r2 b/metadata/md5-cache/dev-java/jaxr-1.0.6-r2
index 8edf5a2e124e..479b1a9683bb 100644
--- a/metadata/md5-cache/dev-java/jaxr-1.0.6-r2
+++ b/metadata/md5-cache/dev-java/jaxr-1.0.6-r2
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=dev-java/jaxb:2 dev-java/jsr67:0 dev-java/jsr93:0 dev-java/jsr173:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jaxr-1.0.6.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9366fafebcb77966f9f86de1447b7b3a
diff --git a/metadata/md5-cache/dev-java/jazzy-0.5.2-r1 b/metadata/md5-cache/dev-java/jazzy-0.5.2-r1
index 162727cb6b86..1efd9a63c5de 100644
--- a/metadata/md5-cache/dev-java/jazzy-0.5.2-r1
+++ b/metadata/md5-cache/dev-java/jazzy-0.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jazzy/jazzy-0.5.2.src.zip -> jazzy-0.5.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65268d2894ad5a3400b9fc4ef8447739
diff --git a/metadata/md5-cache/dev-java/jbitcollider-core-0.8 b/metadata/md5-cache/dev-java/jbitcollider-core-0.8
index c3a25ba09458..f9f5b278d16d 100644
--- a/metadata/md5-cache/dev-java/jbitcollider-core-0.8
+++ b/metadata/md5-cache/dev-java/jbitcollider-core-0.8
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/bitcollider/jBitcollider-0.8.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f4a3ffd89a92784bcc9f6c6635cd10a
diff --git a/metadata/md5-cache/dev-java/jboss-logging-3.1.4 b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
index f18982ae774d..d444159b986e 100644
--- a/metadata/md5-cache/dev-java/jboss-logging-3.1.4
+++ b/metadata/md5-cache/dev-java/jboss-logging-3.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/jboss-logmanager:0 >=dev-java/slf4j-api-1.7.7 dev-java/log4j:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logging/archive/3.1.4.GA.tar.gz -> jboss-logging-3.1.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a044d8906d252cf7b40c99ea17f9ac4c
diff --git a/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1 b/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
index 0478ce506c29..a949fb4b6792 100644
--- a/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
+++ b/metadata/md5-cache/dev-java/jboss-logmanager-1.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-logging/jboss-logmanager/archive/1.5.1.Final.tar.gz -> jboss-logmanager-1.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edb3034f46b5d411dca2bca4078adbe2
diff --git a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0 b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
index 76f3deab6265..acfe60725b3f 100644
--- a/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-marshalling-1.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/jboss-modules:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://download.jboss.org/jbossmarshalling/jboss-marshalling-1.3.0.CR9-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41a15d1d8196904c379ca8ce73559df1
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.0 b/metadata/md5-cache/dev-java/jboss-modules-1.3.0
index 90f8549ad5d7..e39c75d24d32 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.0
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.0.Final.tar.gz -> jboss-modules-1.3.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7cc83cf99911c4be1d0aec92e07e5f3b
diff --git a/metadata/md5-cache/dev-java/jboss-modules-1.3.3 b/metadata/md5-cache/dev-java/jboss-modules-1.3.3
index 1bd3fae665ab..3ae4b95e1463 100644
--- a/metadata/md5-cache/dev-java/jboss-modules-1.3.3
+++ b/metadata/md5-cache/dev-java/jboss-modules-1.3.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jboss-modules/jboss-modules/archive/1.3.3.Final.tar.gz -> jboss-modules-1.3.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74738c1d303cccbc051169b9b7fc522d
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4 b/metadata/md5-cache/dev-java/jcalendar-1.4
index 7ed52cf30c93..dd2b4c12d6c4 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.6 >=dev-java/java-config-2.2
 RESTRICT=test
 SLOT=1.2
 SRC_URI=http://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cdfbc310ac4895a3bd71a75204f2068d
diff --git a/metadata/md5-cache/dev-java/jchardet-1.1-r1 b/metadata/md5-cache/dev-java/jchardet-1.1-r1
index a7324e8acb04..179bfd2ac3e8 100644
--- a/metadata/md5-cache/dev-java/jchardet-1.1-r1
+++ b/metadata/md5-cache/dev-java/jchardet-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jchardet/jchardet/jchardet-1.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0eafbfdc7992f891acd52b703228e905
diff --git a/metadata/md5-cache/dev-java/jchart2d-3.2.2 b/metadata/md5-cache/dev-java/jchart2d-3.2.2
index 05deafad1d4d..2815589e5c82 100644
--- a/metadata/md5-cache/dev-java/jchart2d-3.2.2
+++ b/metadata/md5-cache/dev-java/jchart2d-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/jide-oss:0 dev-java/xmlgraphics-commons:2 >=d
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jchart2d/jchart2d/sources/jchart2d-eclipse-project-3.2.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b9a279be34e57f2670a1df8edb0aef4
diff --git a/metadata/md5-cache/dev-java/jcharts-0.7.5-r3 b/metadata/md5-cache/dev-java/jcharts-0.7.5-r3
index f02c55168e87..2592a74bff47 100644
--- a/metadata/md5-cache/dev-java/jcharts-0.7.5-r3
+++ b/metadata/md5-cache/dev-java/jcharts-0.7.5-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-java/batik:1.8 java-virtuals/servlet-api:3.0 || ( virtual/jre:1.6 vi
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jcharts/jCharts-0.7.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b78e46c484be101f3e60d578bbf0c638
diff --git a/metadata/md5-cache/dev-java/jcifs-1.3.17-r1 b/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
index 8a0bdcbeb989..e4c71c4fbf27 100644
--- a/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
+++ b/metadata/md5-cache/dev-java/jcifs-1.3.17-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=http://jcifs.samba.org/src/jcifs-1.3.17.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7bd60229f94ac09be6d4e2beb553c0cb
diff --git a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1 b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
index 98e05fb72b55..bfc35c229efb 100644
--- a/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
+++ b/metadata/md5-cache/dev-java/jcip-annotations-1.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/stephenc/jcip-annotations/archive/jcip-annotations-1.0-1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c73dd9cb6bfb232fe5c14eafc978bd03
diff --git a/metadata/md5-cache/dev-java/jclasslib-3.0-r1 b/metadata/md5-cache/dev-java/jclasslib-3.0-r1
index 3aa6bb2fa946..39db05cca74e 100644
--- a/metadata/md5-cache/dev-java/jclasslib-3.0-r1
+++ b/metadata/md5-cache/dev-java/jclasslib-3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jclasslib/jclasslib_unix_3_0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d02e9041b127873d27b72545268540b2
diff --git a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2 b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
index 5921b0f99733..923a8c457269 100644
--- a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jcmdline/jcmdline-1.0.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ace69e084a4809a7759b605fd57d834
diff --git a/metadata/md5-cache/dev-java/jcmdline-2.0.0 b/metadata/md5-cache/dev-java/jcmdline-2.0.0
index 4bdbb2293f59..dc336d589f9e 100644
--- a/metadata/md5-cache/dev-java/jcmdline-2.0.0
+++ b/metadata/md5-cache/dev-java/jcmdline-2.0.0
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jcmdline/jcmdline-2.0.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c0cabd76ddc937829ac7de62bd70a556
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.11 b/metadata/md5-cache/dev-java/jcodings-1.0.11
index 0b1fc1e33971..b8faf44babc3 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.11
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jruby/jcodings/archive/jcodings-1.0.11.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e17cbe64f444d481366f79c820cb84a
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.4 b/metadata/md5-cache/dev-java/jcodings-1.0.4
index f0eea1af0e3a..62cfac6b30a9 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.4
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jcodings-1.0.4-git.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=865792815b973b533cb7af6becd00f50
diff --git a/metadata/md5-cache/dev-java/jcodings-1.0.5 b/metadata/md5-cache/dev-java/jcodings-1.0.5
index 552992f97c7c..66d6426baa82 100644
--- a/metadata/md5-cache/dev-java/jcodings-1.0.5
+++ b/metadata/md5-cache/dev-java/jcodings-1.0.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jruby/jcodings/tarball/1.0.5 -> jcodings-1.0.5-git.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b7ad123cddcc75319f445e97f67b5c23
diff --git a/metadata/md5-cache/dev-java/jcommander-1.48 b/metadata/md5-cache/dev-java/jcommander-1.48
index 1040251c3bde..7b539f7f610f 100644
--- a/metadata/md5-cache/dev-java/jcommander-1.48
+++ b/metadata/md5-cache/dev-java/jcommander-1.48
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/jcommander/archive/jcommander-1.48.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d26df66391499bc25b21df62d93abe9
diff --git a/metadata/md5-cache/dev-java/jcommon-1.0.23 b/metadata/md5-cache/dev-java/jcommon-1.0.23
index 8f4c7595b405..fef6dacb2ced 100644
--- a/metadata/md5-cache/dev-java/jcommon-1.0.23
+++ b/metadata/md5-cache/dev-java/jcommon-1.0.23
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jcommon-1.0.23.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bc420285e4970c254a1d835a7a93e9d
diff --git a/metadata/md5-cache/dev-java/jcs-2.0 b/metadata/md5-cache/dev-java/jcs-2.0
index d694a59402c9..c3dff91e3464 100644
--- a/metadata/md5-cache/dev-java/jcs-2.0
+++ b/metadata/md5-cache/dev-java/jcs-2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/jisp:2.5 dev-db/hsqldb:0 dev-java/log4j:0 dev-java/xmlrpc:3 dev-java/commons-lang:0 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-logging:0 dev-java/commons-httpclient:3 java-virtuals/servlet-api:3.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-beta-1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1ff06e4baddee5bb121c4a18c3a87ba
diff --git a/metadata/md5-cache/dev-java/jdbc-informix-3.00.3 b/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
index f7cdf13da690..015f9c63b03b 100644
--- a/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
+++ b/metadata/md5-cache/dev-java/jdbc-informix-3.00.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=JDBC.3.00.JC3.tar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef1009d065a006d205f676b003d502d2
diff --git a/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.9 b/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.9
index 8cf53e81680b..97e5881cabcb 100644
--- a/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.9
+++ b/metadata/md5-cache/dev-java/jdbc-jaybird-2.2.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-java/junit:4 dev-java/antlr:3.5 dev-java/log4j:0 dev-java/glassfish-connector-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FirebirdSQL/jaybird/archive/v2.2.9.zip -> Jaybird-2.2.9-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ea17a236201357de72cfc439bd28feb
diff --git a/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100 b/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
index 5d6c1f9210a5..5dca7b504665 100644
--- a/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
+++ b/metadata/md5-cache/dev-java/jdbc-mssqlserver-4.0.2206.100
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 RESTRICT=mirror
 SLOT=4.0
 SRC_URI=http://download.microsoft.com/download/0/2/A/02AAE597-3865-456C-AE7F-613F99F850A8/sqljdbc_4.0.2206.100_enu.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59d8b94bf609813de27ff69d6bbe8e1a
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
index 5cfab583e39c..979eae7e0f01 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/Connector-J/mysql-connector-java-5.1.26.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=506f388b403ed820fcc1ef7c3b470747
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
index 19c9c16a3101..f01347ca25c0 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.1.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=10.1
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.1.0.5-ojdbc14dms_g.jar ) ) jdbc-oracle-bin-10.1.0.5-ocrs12.jar doc? ( jdbc-oracle-bin-10.1.0.5-javadoc.zip ) examples? ( jdbc-oracle-bin-10.1.0.5-demo.tar ) nls? ( jdbc-oracle-bin-10.1.0.5-orai18n.jar )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2ba19b2dc5087a23176e97ef633c6d1
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
index a4f88b6b30fa..ca66c8211524 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=10.2
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.2.0.3-ojdbc14dms_g.jar ) ) doc? ( jdbc-oracle-bin-10.2.0.1-javadoc.zip ) examples? ( jdbc-oracle-bin-10.2.0.3-demo.tar ) nls? ( jdbc-oracle-bin-10.2.0.3-orai18n.jar ) ons? ( jdbc-oracle-bin-10.2.0.3-ons.jar )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f3014cc6c4660a00f722bdbbef10ebd
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
index 20af1ad1d4d9..945c1c9ffc33 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-10.2.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=10.2
 SRC_URI=!dms? ( !debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14.jar ) debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14_g.jar ) ) dms? ( !debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14dms.jar ) debug? ( jdbc-oracle-bin-10.2.0.4-ojdbc14dms_g.jar ) ) doc? ( jdbc-oracle-bin-10.2.0.1-javadoc.zip ) examples? ( jdbc-oracle-bin-10.2.0.4-demo.tar ) nls? ( jdbc-oracle-bin-10.2.0.4-orai18n.jar ) ons? ( jdbc-oracle-bin-10.2.0.3-ons.jar )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c9e76560a073735f334fc57151947dd
diff --git a/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8 b/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
index 6fc62d67a612..c76f3a148378 100644
--- a/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
+++ b/metadata/md5-cache/dev-java/jdbc-oracle-bin-9.2.0.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=9.2
 SRC_URI=!debug? ( jdbc-oracle-bin-9.2.0.8-ojdbc14.jar ) debug? ( jdbc-oracle-bin-9.2.0.8-ojdbc14_g.jar ) jdbc-oracle-bin-9.2.0.8-ocrs12.jar doc? ( jdbc-oracle-bin-9.2.0.8-javadoc.tar )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74b51075d9460aee5c3d12f0801c4e4f
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
index 7a5e7edee569..6294e5ec75cd 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1003
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1003.src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d0a532eda10a36710cb8ce19893cdca
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
index 699a4131c58f..1db429a7d29e 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.2_p1004
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.2-1004.src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c69e626b5168b91dae64d17417c5e51f
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
index 0e75a609be13..02bd07c47002 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.3_p1100
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.3-1100.src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c69e626b5168b91dae64d17417c5e51f
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
index fdbf318a1096..05829c72213b 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1205.src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2441372d0a78501e6da11b736e01565
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
index 1305dc9f048e..7cb41d8353b5 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1206.src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=994d15b03b264d161fd123c5cab24dad
diff --git a/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3 b/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
index cda08d562543..8b4fc1e04d7a 100644
--- a/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
+++ b/metadata/md5-cache/dev-java/jdbc2-stdext-2.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jdbc2_0-stdext-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0981eea9a722149e594736f60f44db1b
diff --git a/metadata/md5-cache/dev-java/jdbm-0.12-r2 b/metadata/md5-cache/dev-java/jdbm-0.12-r2
index 313f906cebb7..e78fdb52dcfd 100644
--- a/metadata/md5-cache/dev-java/jdbm-0.12-r2
+++ b/metadata/md5-cache/dev-java/jdbm-0.12-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/jdbm/jdbm-0.12-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6f9e13c751147a7777fdca29467ae51
diff --git a/metadata/md5-cache/dev-java/jdepend-2.9-r5 b/metadata/md5-cache/dev-java/jdepend-2.9-r5
index 286f2996119b..d195da31c508 100644
--- a/metadata/md5-cache/dev-java/jdepend-2.9-r5
+++ b/metadata/md5-cache/dev-java/jdepend-2.9-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.clarkware.com/software/jdepend-2.9.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c767accef18adf42bfef1523c274b890
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r2 b/metadata/md5-cache/dev-java/jdom-1.0-r2
index b9437fa328d6..ad44300b58b3 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r2
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db11827a79653f976ba0e8a96b707bb5
diff --git a/metadata/md5-cache/dev-java/jdom-1.0-r4 b/metadata/md5-cache/dev-java/jdom-1.0-r4
index 463fedf05c0c..2ef7cb6b58e7 100644
--- a/metadata/md5-cache/dev-java/jdom-1.0-r4
+++ b/metadata/md5-cache/dev-java/jdom-1.0-r4
@@ -10,5 +10,5 @@ PDEPEND=~dev-java/jdom-jaxen-1.0
 RDEPEND=>=virtual/jre-1.4 dev-java/saxpath >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/archive/jdom-1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2ec920c5bf26545b83b5b23ba8e13e97
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3 b/metadata/md5-cache/dev-java/jdom-1.1.3
index 7bd0a955f348..745422a2f4a3 100644
--- a/metadata/md5-cache/dev-java/jdom-1.1.3
+++ b/metadata/md5-cache/dev-java/jdom-1.1.3
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=69d149d1f40ff0a52007a503c2681841
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r4 b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
index 2bfcc76b6bcf..fee228d2dd3f 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r4
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55afe736f9ca8ed313e5ce1c70e3b749
diff --git a/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1 b/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
index f465a15fc25b..420a9d06601f 100644
--- a/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
+++ b/metadata/md5-cache/dev-java/jdom-jaxen-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 =dev-java/jaxen-1.1* dev-java/saxpath >=dev-java/java-config-2.2.0
 SLOT=1.0
 SRC_URI=http://www.jdom.org/dist/source/jdom-1.0.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a08fc4de9f15c9aad091b4d870ccb4dd
diff --git a/metadata/md5-cache/dev-java/jdynamite-1.2-r1 b/metadata/md5-cache/dev-java/jdynamite-1.2-r1
index cf7e496e553d..7921cea68fab 100644
--- a/metadata/md5-cache/dev-java/jdynamite-1.2-r1
+++ b/metadata/md5-cache/dev-java/jdynamite-1.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-java/gnu-regexp:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jdynamite/jdynamite1_2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1767d348928bffc2037e0b6611642a6
diff --git a/metadata/md5-cache/dev-java/jebl-2013.02.18 b/metadata/md5-cache/dev-java/jebl-2013.02.18
index f64d37f55dd4..40d7dc860ffc 100644
--- a/metadata/md5-cache/dev-java/jebl-2013.02.18
+++ b/metadata/md5-cache/dev-java/jebl-2013.02.18
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/jebl-2013.02.18.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=942a9e4e900e5bfa4c5a9a6286b74c6b
diff --git a/metadata/md5-cache/dev-java/jempbox-1.7.1 b/metadata/md5-cache/dev-java/jempbox-1.7.1
index f7bf941f3644..489aece61123 100644
--- a/metadata/md5-cache/dev-java/jempbox-1.7.1
+++ b/metadata/md5-cache/dev-java/jempbox-1.7.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.7
 SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d67c518c3c3b84cf7a1c83c22c0cb27c
diff --git a/metadata/md5-cache/dev-java/jettison-1.3.7 b/metadata/md5-cache/dev-java/jettison-1.3.7
index d419bedee2bf..ae09d8c4768c 100644
--- a/metadata/md5-cache/dev-java/jettison-1.3.7
+++ b/metadata/md5-cache/dev-java/jettison-1.3.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/codehaus/jettison/archive/jettison-1.3.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e6d4804727523c6cc342a59c1c9e142
diff --git a/metadata/md5-cache/dev-java/jexcelapi-2.6.8 b/metadata/md5-cache/dev-java/jexcelapi-2.6.8
index 360d5724eec2..b6fa33afa1bc 100644
--- a/metadata/md5-cache/dev-java/jexcelapi-2.6.8
+++ b/metadata/md5-cache/dev-java/jexcelapi-2.6.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://sourceforge/jexcelapi/jexcelapi_2_6_8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd92070a551b6141808ae95c3e4cac4f
diff --git a/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1 b/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1
index 3b4db17f1ddb..5aa6190c4c9e 100644
--- a/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1
+++ b/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://sourceforge/jexcelapi/jexcelapi_2_6_8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3dddf3047c39522070e441691788d7b
diff --git a/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r2 b/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r2
index cde3206fb7cf..5a64ead42f28 100644
--- a/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r2
+++ b/metadata/md5-cache/dev-java/jexcelapi-2.6.8-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/log4j:0 app-arch/unzip >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jexcelapi/jexcelapi_2_6_8.tar.gz -> jexcelapi-2.6.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=69b92d8d87fc9c47448d3ace7e67f0f2
diff --git a/metadata/md5-cache/dev-java/jffi-1.0.11-r1 b/metadata/md5-cache/dev-java/jffi-1.0.11-r1
index 443510716597..5a6ed3362dbf 100644
--- a/metadata/md5-cache/dev-java/jffi-1.0.11-r1
+++ b/metadata/md5-cache/dev-java/jffi-1.0.11-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jffi/tarball/1.0.11 -> jffi-1.0.11.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=335c640e5d334ce39fdb8b3c4c5ca164
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.9 b/metadata/md5-cache/dev-java/jffi-1.2.9
index e9637fbed988..b39fbaead2d7 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.9
+++ b/metadata/md5-cache/dev-java/jffi-1.2.9
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=1.2
 SRC_URI=https://github.com/jnr/jffi/archive/1.2.9.tar.gz -> jffi-1.2.9.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a359b1b446ccdcfa4abadcc7f0d50bb2
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.0-r2 b/metadata/md5-cache/dev-java/jflex-1.6.0-r2
index 16e109d01be6..41c07bb90513 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.0-r2
+++ b/metadata/md5-cache/dev-java/jflex-1.6.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jflex.de/jflex-1.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fafa9807c128c10b38be32ebbc41f0da
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1 b/metadata/md5-cache/dev-java/jflex-1.6.1
index 273c37b0ac55..436ed46138ed 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1
@@ -10,5 +10,5 @@ PDEPEND=>=dev-java/javacup-0.11b_p20151001:0
 RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8cacbbc583ba7c463cb22374391ca168
diff --git a/metadata/md5-cache/dev-java/jformatstring-2.0.3 b/metadata/md5-cache/dev-java/jformatstring-2.0.3
index 0a5bee49ed59..b1cb762ae2d4 100644
--- a/metadata/md5-cache/dev-java/jformatstring-2.0.3
+++ b/metadata/md5-cache/dev-java/jformatstring-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c68c600533e841316b52d31fa7877d7
diff --git a/metadata/md5-cache/dev-java/jfreechart-1.0.19 b/metadata/md5-cache/dev-java/jfreechart-1.0.19
index 0e35185ad4bf..771a5014c5da 100644
--- a/metadata/md5-cache/dev-java/jfreechart-1.0.19
+++ b/metadata/md5-cache/dev-java/jfreechart-1.0.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jcommon-1.0.23:1.0 dev-java/jfreesvg:2.1 servlet? ( java-virt
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://sourceforge/jfreechart/jfreechart-1.0.19.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=644b236d02d2de14e9ca34896f7dd410
diff --git a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1 b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
index 567df287fe10..7c9b7b575da2 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
+++ b/metadata/md5-cache/dev-java/jfreesvg-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-2.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c25afddf0aac5f53525011cb95b12d40
diff --git a/metadata/md5-cache/dev-java/jfreesvg-3.0 b/metadata/md5-cache/dev-java/jfreesvg-3.0
index db3d5f668ad9..a0f2a14d5a4f 100644
--- a/metadata/md5-cache/dev-java/jfreesvg-3.0
+++ b/metadata/md5-cache/dev-java/jfreesvg-3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://sourceforge/jfreegraphics2d/jfreesvg-3.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3ec0a14f3c91fa668ba07356258f39d
diff --git a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0 b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
index b0ce9c414dfe..d7fe73f80c7a 100644
--- a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
+++ b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 examples? ( x86? ( >=dev-java/jgoodies-binding-1.1 >=dev-java/jgoodies-forms-1.0 ) ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=584169f0a70716973b43be191131b220
diff --git a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1 b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
index a26f0102911d..770d411339ad 100644
--- a/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-animation-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 examples? ( >=dev-java/jgoodies-binding-1.1:1.0 >=dev-java/jgoodies-forms-1.0:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/animation-1_2_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdf04eb694de4a685360451183035ca8
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
index 5dd06574a306..1db6ac0fb434 100644
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
+++ b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4.2 examples? ( >=dev-java/jgoodies-looks-1.0.5 ) >=dev-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85d3635ee5a40ae707d4f762d8f9770f
diff --git a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1 b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
index fee68506774b..0f5c1436a35a 100644
--- a/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-binding-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4.2 examples? ( >=dev-java/jgoodies-looks-1.0.5 ) >=dev-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://www.jgoodies.com/download/libraries/binding-1_1_2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1add2825937efab85c216f389039eb62
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
index f200e6536188..7c6061cbe4f0 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bbc7b8c0b46739035e409109cc8cc24c
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0 b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
index 423cba27e38b..f3530c80dda3 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/forms-1_3_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa14e85b777b38f55ce44ee648765a63
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1 b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
index 84a569975072..c424d9c3a101 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/forms-1_3_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df86748e354ac0e5e53b95c9156be277
diff --git a/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
index 1f8e0e49bc00..dd025abfb63d 100644
--- a/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
+++ b/metadata/md5-cache/dev-java/jgoodies-forms-1.8.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/jgoodies-common:1.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.8
 SRC_URI=http://www.jgoodies.com/download/libraries/forms/jgoodies-forms-1_8_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb3b1eb1524e8fe22f31ce67c220331e
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2 b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
index ce34a5215c8f..ebd41c6e4b97 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.2
 SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85c468dca1f56fe14110d82659632b3a
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
index 9064164949dd..a48607d1a681 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.0
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92dd9af00e39e7f5545ce685c666746c
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
index f1247d0e19b9..d8ee359e0502 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jgoodies-common:1.8 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.6
 SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3608ddfaed12185e2fc3368d8923ecb9
diff --git a/metadata/md5-cache/dev-java/jgraph-5.12.0.4 b/metadata/md5-cache/dev-java/jgraph-5.12.0.4
index ddb14c9501b9..5156767ed476 100644
--- a/metadata/md5-cache/dev-java/jgraph-5.12.0.4
+++ b/metadata/md5-cache/dev-java/jgraph-5.12.0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jgraph/jgraph-5.12.0.4-lgpl-src.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62dee6f7fbb2acf3c3bd54aa77cc1486
diff --git a/metadata/md5-cache/dev-java/jgrapht-0.8.3 b/metadata/md5-cache/dev-java/jgrapht-0.8.3
index 8889f6ffd384..9bf84220f2da 100644
--- a/metadata/md5-cache/dev-java/jgrapht-0.8.3
+++ b/metadata/md5-cache/dev-java/jgrapht-0.8.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/touchgraph-graphlayout:0 dev-java/jgraph:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jgrapht/jgrapht-0.8.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5d0c06e20d9986f86cdcf47da6a6ffb
diff --git a/metadata/md5-cache/dev-java/jgroups-2.9.0 b/metadata/md5-cache/dev-java/jgroups-2.9.0
index b35084050814..c60aa51804ce 100644
--- a/metadata/md5-cache/dev-java/jgroups-2.9.0
+++ b/metadata/md5-cache/dev-java/jgroups-2.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/bsh:0 dev-java/log4j:0 java-virtuals/jmx >=de
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/javagroups/JGroups-2.9.0.GA.src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dac791c1c88719e4aa86e71d25ddadf
diff --git a/metadata/md5-cache/dev-java/jibx-1.1.5-r1 b/metadata/md5-cache/dev-java/jibx-1.1.5-r1
index f0eb9e93c644..c6bd2548d0db 100644
--- a/metadata/md5-cache/dev-java/jibx-1.1.5-r1
+++ b/metadata/md5-cache/dev-java/jibx-1.1.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/dom4j:1 dev-java/ant-core:0 dev-java/bcel:0 java-virtuals/stax-api dev-java/xpp3:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c7fb7630871f1a9c69c7cab9df6a2f5
diff --git a/metadata/md5-cache/dev-java/jibx-1.1.5-r2 b/metadata/md5-cache/dev-java/jibx-1.1.5-r2
index 7a5d65911a56..01f554103d88 100644
--- a/metadata/md5-cache/dev-java/jibx-1.1.5-r2
+++ b/metadata/md5-cache/dev-java/jibx-1.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/dom4j:1 dev-java/ant-core:0 dev-java/bcel:0 dev-java/xpp3:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=827ef1e4e551b01599075977f07907a9
diff --git a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2 b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
index a029b7007e65..b4d9ed948b9a 100644
--- a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
+++ b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 java-virtuals/stax-api:0 dev-java/jibx:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=983c439d9af7517a134cff782d50fa6a
diff --git a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3 b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
index 32347021821b..2684206e1e0a 100644
--- a/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
+++ b/metadata/md5-cache/dev-java/jibx-tools-1.1.5-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/bcel:0 dev-java/jibx:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/jibx_1_1_5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04677e5a2d3d16e6c22e89954045793f
diff --git a/metadata/md5-cache/dev-java/jicmp-1.0.2 b/metadata/md5-cache/dev-java/jicmp-1.0.2
index 7c8b81f4fce2..e3ebcabb93b8 100644
--- a/metadata/md5-cache/dev-java/jicmp-1.0.2
+++ b/metadata/md5-cache/dev-java/jicmp-1.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jicmp-1.0.2.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76848a76520fdd0bbc22de8c368b3e21
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r2 b/metadata/md5-cache/dev-java/jid3-0.46-r2
index 07b1684b1243..178d58fecb0d 100644
--- a/metadata/md5-cache/dev-java/jid3-0.46-r2
+++ b/metadata/md5-cache/dev-java/jid3-0.46-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e1536f6b7378fe5e6dba5ffd5469eb09
diff --git a/metadata/md5-cache/dev-java/jide-oss-3.6.12 b/metadata/md5-cache/dev-java/jide-oss-3.6.12
index 38a54f506f2e..f47d0e8ab6d8 100644
--- a/metadata/md5-cache/dev-java/jide-oss-3.6.12
+++ b/metadata/md5-cache/dev-java/jide-oss-3.6.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jidesoft/jide-oss/archive/3.6.12.tar.gz -> jide-oss-3.6.12.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa1c6c15c79a5c8ad69ead26b006fe0d
diff --git a/metadata/md5-cache/dev-java/jinklevel-0.1 b/metadata/md5-cache/dev-java/jinklevel-0.1
index dd397eb014e8..f9079a81aca3 100644
--- a/metadata/md5-cache/dev-java/jinklevel-0.1
+++ b/metadata/md5-cache/dev-java/jinklevel-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=net-print/libinklevel-0.8.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mso.googlecode.com/files/jinklevel-0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e81b7f8bf9fe7f218ac57c1bd81fee7
diff --git a/metadata/md5-cache/dev-java/jinput-2.0.6-r1 b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
index fe99e7e2e4f3..1b6376cdd94b 100644
--- a/metadata/md5-cache/dev-java/jinput-2.0.6-r1
+++ b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jinput/jinput/archive/790b666.tar.gz -> jinput-2.0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04b417d6c9e5035d4836e366d95f6f8d
diff --git a/metadata/md5-cache/dev-java/jisp-2.5.1-r3 b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
index 9bb6873ff32a..f8947a1ae316 100644
--- a/metadata/md5-cache/dev-java/jisp-2.5.1-r3
+++ b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
@@ -9,5 +9,5 @@ LICENSE=SVFL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://gentooexperimental.org/distfiles/jisp-2.5.1-source.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73a742298f569d98577ea93fe18b7b66
diff --git a/metadata/md5-cache/dev-java/jlayer-1.0.1 b/metadata/md5-cache/dev-java/jlayer-1.0.1
index 65eeec9c02ed..820bdc95238f 100644
--- a/metadata/md5-cache/dev-java/jlayer-1.0.1
+++ b/metadata/md5-cache/dev-java/jlayer-1.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.javazoom.net/javalayer/sources/jlayer1.0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0fac9a4a6eb79521fe51f34069ea98d1
diff --git a/metadata/md5-cache/dev-java/jlex-1.2.6-r1 b/metadata/md5-cache/dev-java/jlex-1.2.6-r1
index 5ed89d6c241e..42987933ee33 100644
--- a/metadata/md5-cache/dev-java/jlex-1.2.6-r1
+++ b/metadata/md5-cache/dev-java/jlex-1.2.6-r1
@@ -9,5 +9,5 @@ LICENSE=jlex
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jlex-1.2.6.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=45fa57d1fb45c0f3c5133122c22cb88d
diff --git a/metadata/md5-cache/dev-java/jlex-1.2.6-r2 b/metadata/md5-cache/dev-java/jlex-1.2.6-r2
index 39cd3e257023..98c9a2a1fe3e 100644
--- a/metadata/md5-cache/dev-java/jlex-1.2.6-r2
+++ b/metadata/md5-cache/dev-java/jlex-1.2.6-r2
@@ -9,5 +9,5 @@ LICENSE=jlex
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jlex-1.2.6.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac01658c485e7c28e9cec023d94eaeaa
diff --git a/metadata/md5-cache/dev-java/jlfgr-1.0-r1 b/metadata/md5-cache/dev-java/jlfgr-1.0-r1
index 01eac0f296cd..8b1c7a4e8f46 100644
--- a/metadata/md5-cache/dev-java/jlfgr-1.0-r1
+++ b/metadata/md5-cache/dev-java/jlfgr-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=sun-jlfgr
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/jlfgr-1_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65624f0614f80d7553bd9b92f4a6a6aa
diff --git a/metadata/md5-cache/dev-java/jlibeps-0.1 b/metadata/md5-cache/dev-java/jlibeps-0.1
index 426a72197f6c..10c08146c489 100644
--- a/metadata/md5-cache/dev-java/jlibeps-0.1
+++ b/metadata/md5-cache/dev-java/jlibeps-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jlibeps/jlibeps-0.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=540c513fb2722ec373576dfe82f22991
diff --git a/metadata/md5-cache/dev-java/jline-1.0 b/metadata/md5-cache/dev-java/jline-1.0
index aa35cd4b4b5a..e79fc3685199 100644
--- a/metadata/md5-cache/dev-java/jline-1.0
+++ b/metadata/md5-cache/dev-java/jline-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jline/jline-1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d935f456fcb95d855b9886c0035d0094
diff --git a/metadata/md5-cache/dev-java/jline-2.12.1-r1 b/metadata/md5-cache/dev-java/jline-2.12.1-r1
index 9638270801d7..aa84389abe1d 100644
--- a/metadata/md5-cache/dev-java/jline-2.12.1-r1
+++ b/metadata/md5-cache/dev-java/jline-2.12.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jansi:0 dev-java/jansi-native:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jline/jline/archive/jline-2.12.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e615453bd759dd9842c71601983149b
diff --git a/metadata/md5-cache/dev-java/jmdns-3.4.1-r1 b/metadata/md5-cache/dev-java/jmdns-3.4.1-r1
index ea599932bb88..ed0b95ddf66c 100644
--- a/metadata/md5-cache/dev-java/jmdns-3.4.1-r1
+++ b/metadata/md5-cache/dev-java/jmdns-3.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jmdns/jmdns-3.4.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b543a3959baaac67dd502480bc0c29e
diff --git a/metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2 b/metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2
index 70a92cf351b7..2ac551b6ff18 100644
--- a/metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2
+++ b/metadata/md5-cache/dev-java/jmf-bin-2.1.1e-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jmf-2_1_1e-alljava.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=adff3978e55ae4d0bb03d7eafb935849
diff --git a/metadata/md5-cache/dev-java/jmi-interface-1.0-r3 b/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
index a53c0c860e35..ecb2c2fc8a42 100644
--- a/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
+++ b/metadata/md5-cache/dev-java/jmi-interface-1.0-r3
@@ -9,5 +9,5 @@ LICENSE=sun-bcla-jmi
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/jmi-1_0-fr-interfaces.zip mirror://gentoo/mof-1.0.xml.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70089cc4620f9295eeb588d266ec6b80
diff --git a/metadata/md5-cache/dev-java/jmock-1.2.0-r1 b/metadata/md5-cache/dev-java/jmock-1.2.0-r1
index 01fc39208198..34d416827603 100644
--- a/metadata/md5-cache/dev-java/jmock-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/jmock-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=http://www.jmock.org/downloads/jmock-1.2.0-jars.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3882d829206cfd3ce799d70aa6fbc6db
diff --git a/metadata/md5-cache/dev-java/jmock-2.6.1 b/metadata/md5-cache/dev-java/jmock-2.6.1
index df0c2221a151..d575feff275d 100644
--- a/metadata/md5-cache/dev-java/jmock-2.6.1
+++ b/metadata/md5-cache/dev-java/jmock-2.6.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/junit:4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://www.jmock.org/downloads/jmock-2.6.1-jars.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b41ca81f42b30c7c6216486752b59e04
diff --git a/metadata/md5-cache/dev-java/jna-3.4.0 b/metadata/md5-cache/dev-java/jna-3.4.0
index 2a80f44722cf..57d4efb04a04 100644
--- a/metadata/md5-cache/dev-java/jna-3.4.0
+++ b/metadata/md5-cache/dev-java/jna-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? (
 REQUIRED_USE=test? ( awt nio-buffers )
 SLOT=0
 SRC_URI=https://github.com/twall/jna/tarball/3.4.0 -> jna-3.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=34b1633398ec48616a8c72e41cd7c12b
diff --git a/metadata/md5-cache/dev-java/jna-3.4.0-r1 b/metadata/md5-cache/dev-java/jna-3.4.0-r1
index 32fad4a8f127..7d140ca48865 100644
--- a/metadata/md5-cache/dev-java/jna-3.4.0-r1
+++ b/metadata/md5-cache/dev-java/jna-3.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? (
 REQUIRED_USE=test? ( awt nio-buffers )
 SLOT=0
 SRC_URI=https://github.com/twall/jna/tarball/3.4.0 -> jna-3.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4b30545c97103a3c1cbe3ad5bf0cf1b
diff --git a/metadata/md5-cache/dev-java/jna-3.4.1 b/metadata/md5-cache/dev-java/jna-3.4.1
index dcaf692917c4..90edbf6b303a 100644
--- a/metadata/md5-cache/dev-java/jna-3.4.1
+++ b/metadata/md5-cache/dev-java/jna-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? (
 REQUIRED_USE=test? ( awt nio-buffers )
 SLOT=0
 SRC_URI=https://github.com/twall/jna/tarball/3.4.1 -> jna-3.4.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf8a311885564d9ba9f9e4e5c03311a2
diff --git a/metadata/md5-cache/dev-java/jnlp-api-6.0.18 b/metadata/md5-cache/dev-java/jnlp-api-6.0.18
index aeeb9eb9770a..7bd5a9a22c50 100644
--- a/metadata/md5-cache/dev-java/jnlp-api-6.0.18
+++ b/metadata/md5-cache/dev-java/jnlp-api-6.0.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~caster/distfiles/jnlp-api-6.0.18.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0b9b1fde45e57724d363fba5a90b706
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1 b/metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1
index 9bfcd5bcc855..b6e5f14c74d4 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.8.2
 SRC_URI=https://github.com/jnr/jnr-constants/tarball/0.8.3 -> jnr-constants-0.8.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d69dcf05ac44cbc9f6209d95b6f97b11
diff --git a/metadata/md5-cache/dev-java/jnr-constants-0.8.6 b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
index d92036cdb4a4..797e9b15c929 100644
--- a/metadata/md5-cache/dev-java/jnr-constants-0.8.6
+++ b/metadata/md5-cache/dev-java/jnr-constants-0.8.6
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-constants/archive/jnr-constants-0.8.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e73d5cb697e1ca162b5ac025b846d786
diff --git a/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1 b/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
index 5aa218a190fd..0e3be6c77a68 100644
--- a/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
+++ b/metadata/md5-cache/dev-java/jnr-enxio-0.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-enxio/archive/0.7.tar.gz -> jnr-enxio-0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=104914c0495518c9b09e24a2d39c01d2
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.5.10 b/metadata/md5-cache/dev-java/jnr-ffi-0.5.10
index 0b2953e2f761..8dad2aac1421 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.5.10
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.5.10
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.5
 SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.5.10 -> jnr-ffi-0.5.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79a0209d2048161458a2df7f089ae68d
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.6.0 b/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
index 7c68270e8a4e..9fc72479396a 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jffi:1.0 dev-java/jnr-x86asm:1.0 dev-java/asm:3 >=virtual/jre-1
 RESTRICT=test
 SLOT=0.6
 SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.6.0 -> jnr-ffi-0.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a735afa695339c894e2a8e8a2a23a630
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1 b/metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1
index 4baa06a2f42c..5dda4a872a34 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1
+++ b/metadata/md5-cache/dev-java/jnr-ffi-0.7.11-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=>=dev-java/jffi-1.2.7-r1:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0.7
 SRC_URI=https://github.com/jnr/jnr-ffi/tarball/0.7.11 -> jnr-ffi-0.7.11.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff6831b0846c0ee8ad44f362fc1d8a10
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-1.0.10 b/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
index 85008d6eb487..420a66034882 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
+++ b/metadata/md5-cache/dev-java/jnr-ffi-1.0.10
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/1.0.10.tar.gz -> jnr-ffi-1.0.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5a623905378eccae43ea517ea1a0dea
diff --git a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2 b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
index cc102273a3db..a8e3f02a0840 100644
--- a/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
+++ b/metadata/md5-cache/dev-java/jnr-ffi-2.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-3 )
 RDEPEND=dev-java/jffi:1.2 dev-java/jnr-x86asm:1.0 dev-java/asm:4 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/jnr/jnr-ffi/archive/2.0.2.tar.gz -> jnr-ffi-2.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf9ab8c7120b1716671842fc4ecc5562
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
index 22f4d65a4640..66321e392fab 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b91fb954095424b23cc5a15b286daf4
diff --git a/metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1 b/metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1
index 86f7ed5c38b5..ee38232ec0c7 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1
+++ b/metadata/md5-cache/dev-java/jnr-posix-1.1.8-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0.8.2 dev-java/jnr-ffi:0.5 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/jnr/jnr-posix/tarball/1.1.8 -> jnr-posix-1.1.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1affc22d252b4cc2f84f236fbca05a06
diff --git a/metadata/md5-cache/dev-java/jnr-posix-2.4.0 b/metadata/md5-cache/dev-java/jnr-posix-2.4.0
index 891ba49bebd0..28985dc0bd68 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-2.4.0
+++ b/metadata/md5-cache/dev-java/jnr-posix-2.4.0
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:0.7 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=https://github.com/jnr/jnr-posix/tarball/2.4.0 -> jnr-posix-2.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46901f63c1b33e17e00415f320b68310
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
index 661a2d4facb4..f07932c2bf32 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.10
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.10
@@ -9,5 +9,5 @@ LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/3.0.10.tar.gz -> jnr-posix-3.0.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5adbc622db0df8de9e7e52157aa1fcd4
diff --git a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1 b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
index 215c99ab8991..d73242de07f7 100644
--- a/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
+++ b/metadata/md5-cache/dev-java/jnr-unixsocket-0.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-enxio:0 dev-java/jnr-posix:3.0 dev-java/jnr-ffi:2 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jnr/jnr-unixsocket/archive/0.6.tar.gz -> jnr-unixsocket-0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed257ed13f1a66826b712ef8b8671cda
diff --git a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r1 b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r1
index 01b5af0890c6..30dbbf40fe48 100644
--- a/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r1
+++ b/metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-x86asm/archive/1.0.2.zip -> jnr-x86asm-1.0.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d36b9fa1b0c3f41974b73bfda7f66771
diff --git a/metadata/md5-cache/dev-java/joda-convert-1.3.1 b/metadata/md5-cache/dev-java/joda-convert-1.3.1
index 8c64ef3b1995..78205766fbcf 100644
--- a/metadata/md5-cache/dev-java/joda-convert-1.3.1
+++ b/metadata/md5-cache/dev-java/joda-convert-1.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-convert/joda-convert-1.3.1-dist.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ca68ff52bd56e3a93b2ccdff4c5ae97
diff --git a/metadata/md5-cache/dev-java/joda-time-1.6 b/metadata/md5-cache/dev-java/joda-time-1.6
index 16a60824c4aa..2b79ac0ec8cb 100644
--- a/metadata/md5-cache/dev-java/joda-time-1.6
+++ b/metadata/md5-cache/dev-java/joda-time-1.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-time/joda-time-1.6-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0605a26acf7dff4ced49a03adf463192
diff --git a/metadata/md5-cache/dev-java/joda-time-2.2 b/metadata/md5-cache/dev-java/joda-time-2.2
index be3a2bb1a2d6..2bec5e8d47cd 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.2
+++ b/metadata/md5-cache/dev-java/joda-time-2.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-time/joda-time-2.2-dist.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7193d6e20860e2f839ab9d9b278f6bdc
diff --git a/metadata/md5-cache/dev-java/joda-time-2.3 b/metadata/md5-cache/dev-java/joda-time-2.3
index bd80f3454ca7..dacfbc548c9b 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.3
+++ b/metadata/md5-cache/dev-java/joda-time-2.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/joda-time/joda-time-2.3-dist.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e45844ca8fa082b33208d6fe9f0702f8
diff --git a/metadata/md5-cache/dev-java/joda-time-2.7 b/metadata/md5-cache/dev-java/joda-time-2.7
index 6a2a2dca8a11..2d2ffb6bc4cf 100644
--- a/metadata/md5-cache/dev-java/joda-time-2.7
+++ b/metadata/md5-cache/dev-java/joda-time-2.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/JodaOrg/joda-time/releases/download/v2.7/joda-time-2.7-dist.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e15e22a97ddf0b9fc3297ba65356a26d
diff --git a/metadata/md5-cache/dev-java/joni-2.1.0 b/metadata/md5-cache/dev-java/joni-2.1.0
index 3ff46998e32e..1b9200b9ea49 100644
--- a/metadata/md5-cache/dev-java/joni-2.1.0
+++ b/metadata/md5-cache/dev-java/joni-2.1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/asm:3 dev-java/jcodings:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.1
 SRC_URI=https://github.com/jruby/joni/archive/joni-2.1.0.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9b41cad5ccc12b1ce32198182082038
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.7 b/metadata/md5-cache/dev-java/jopt-simple-4.7
index 7715a40fdee3..e27a4616c7f7 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.7
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.4
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.7 -> jopt-simple-4.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4263c6a64ac6ea95761e771fa1a43360
diff --git a/metadata/md5-cache/dev-java/jopt-simple-4.8 b/metadata/md5-cache/dev-java/jopt-simple-4.8
index e96e236a68ac..37c3fdb59e99 100644
--- a/metadata/md5-cache/dev-java/jopt-simple-4.8
+++ b/metadata/md5-cache/dev-java/jopt-simple-4.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/pholser/jopt-simple/tarball/jopt-simple-4.8 -> jopt-simple-4.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=099cd310fc9c0393a46e5cd4a03701bc
diff --git a/metadata/md5-cache/dev-java/jortho-1.0 b/metadata/md5-cache/dev-java/jortho-1.0
index 7c707d7fdc55..6b8bde312364 100644
--- a/metadata/md5-cache/dev-java/jortho-1.0
+++ b/metadata/md5-cache/dev-java/jortho-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/jortho/JOrtho%20Library/1.0/JOrtho_1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=57c4e1cad73b4e0189722af1c53c37a6
diff --git a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2 b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
index b9ce47db9b91..733745c4e9f0 100644
--- a/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
+++ b/metadata/md5-cache/dev-java/jreleaseinfo-1.3.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jreleaseinfo/jreleaseinfo-1.3.0-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91d55d6b447b34cf5409cd7cd06af15a
diff --git a/metadata/md5-cache/dev-java/jrexx-1.1.1-r1 b/metadata/md5-cache/dev-java/jrexx-1.1.1-r1
index f88b31a142b9..f91160ccdb9f 100644
--- a/metadata/md5-cache/dev-java/jrexx-1.1.1-r1
+++ b/metadata/md5-cache/dev-java/jrexx-1.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jrexx/jrexx-1.1.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61cd9af6a71bc98149289aaaec4ab4df
diff --git a/metadata/md5-cache/dev-java/jrexx-1.1.1-r2 b/metadata/md5-cache/dev-java/jrexx-1.1.1-r2
index 90d0905893a8..6fb867e4007c 100644
--- a/metadata/md5-cache/dev-java/jrexx-1.1.1-r2
+++ b/metadata/md5-cache/dev-java/jrexx-1.1.1-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jrexx/jrexx-1.1.1-src.zip -> jrexx-1.1.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79ae3da6ee1de978f4afa6e27e5358d1
diff --git a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1 b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
index a8f90e56af29..1c817b110a53 100644
--- a/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
+++ b/metadata/md5-cache/dev-java/jrobin-1.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/OpenNMS/jrobin/archive/jrobin-1.6.0-1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce528f31a536e9a35eef395ef22a4140
diff --git a/metadata/md5-cache/dev-java/jrrd-1.0.1-r1 b/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
index c9236956c255..3c788f6b7f20 100644
--- a/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jrrd-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 net-analyzer/rrdtool >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/opennms/jrrd-1.0.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74bf1226c798fbcf93303c2d0985f88e
diff --git a/metadata/md5-cache/dev-java/jruby-1.7.12 b/metadata/md5-cache/dev-java/jruby-1.7.12
index ea838261a391..30f472745314 100644
--- a/metadata/md5-cache/dev-java/jruby-1.7.12
+++ b/metadata/md5-cache/dev-java/jruby-1.7.12
@@ -10,5 +10,5 @@ RDEPEND=dev-java/ant-core:0 dev-java/asm:4 dev-java/bsf:2.3 >=dev-java/bytelist-
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jruby.org.s3.amazonaws.com/downloads/1.7.12/jruby-src-1.7.12.tar.gz https://dev.gentoo.org/~tomwij/files/dist/jruby-1.7.12-mvn-ant-ant.patch
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9a8528c53693ab0f23c2f0ae7346246
diff --git a/metadata/md5-cache/dev-java/jsap-2.1 b/metadata/md5-cache/dev-java/jsap-2.1
index 02edd4b56ed4..207c5e5e8b6e 100644
--- a/metadata/md5-cache/dev-java/jsap-2.1
+++ b/metadata/md5-cache/dev-java/jsap-2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 dev-java/xstream >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsap/JSAP-2.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47d710ef7700c604b08c14b3d068c302
diff --git a/metadata/md5-cache/dev-java/jsap-2.1-r1 b/metadata/md5-cache/dev-java/jsap-2.1-r1
index d280f33ed2ab..237b5a5ee18f 100644
--- a/metadata/md5-cache/dev-java/jsap-2.1-r1
+++ b/metadata/md5-cache/dev-java/jsap-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/xstream:0 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsap/JSAP-2.1-src.tar.gz -> jsap-2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=012c4855722ecfa5832a2f45882e55b7
diff --git a/metadata/md5-cache/dev-java/jsap-2.1-r2 b/metadata/md5-cache/dev-java/jsap-2.1-r2
index b47d1761ccc6..1108f3d76fab 100644
--- a/metadata/md5-cache/dev-java/jsap-2.1-r2
+++ b/metadata/md5-cache/dev-java/jsap-2.1-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/xstream:0 dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsap/JSAP-2.1-src.tar.gz -> jsap-2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b027a79159a2e44bd0c5d61e83ac19f
diff --git a/metadata/md5-cache/dev-java/jsch-0.1.52 b/metadata/md5-cache/dev-java/jsch-0.1.52
index e80d4c3180f4..504217557ff3 100644
--- a/metadata/md5-cache/dev-java/jsch-0.1.52
+++ b/metadata/md5-cache/dev-java/jsch-0.1.52
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 zlib? ( dev-java/jzlib:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jsch/jsch-0.1.52.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1341f6bf211825c8e6d90b829a1c9f20
diff --git a/metadata/md5-cache/dev-java/json-20150729 b/metadata/md5-cache/dev-java/json-20150729
index 5152f8cd7b6d..a137bd64b514 100644
--- a/metadata/md5-cache/dev-java/json-20150729
+++ b/metadata/md5-cache/dev-java/json-20150729
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/douglascrockford/JSON-java/archive/20150729.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e4cd8a419120cf1448e7596a97093ea
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1 b/metadata/md5-cache/dev-java/json-simple-1.1
index 8dc06f6608f2..a41e673185f5 100644
--- a/metadata/md5-cache/dev-java/json-simple-1.1
+++ b/metadata/md5-cache/dev-java/json-simple-1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://json-simple.googlecode.com/files/json_simple-1.1-all.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74f0f038b9a72d27ff00d3d186af0d17
diff --git a/metadata/md5-cache/dev-java/jsoup-1.8.3 b/metadata/md5-cache/dev-java/jsoup-1.8.3
index 9c30e9618d91..f3b350ba6217 100644
--- a/metadata/md5-cache/dev-java/jsoup-1.8.3
+++ b/metadata/md5-cache/dev-java/jsoup-1.8.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/jhy/jsoup/archive/jsoup-1.8.3a.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08aa504f17d71c9e41940f02dd269d12
diff --git a/metadata/md5-cache/dev-java/jspeex-0.9.7-r1 b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
index 7c27b087819a..8e377b7f278f 100644
--- a/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
+++ b/metadata/md5-cache/dev-java/jspeex-0.9.7-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jspeex/jspeex-0.9.7.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c70192c5ec931f00c59287731f94e1f3
diff --git a/metadata/md5-cache/dev-java/jsr101-1.4-r3 b/metadata/md5-cache/dev-java/jsr101-1.4-r3
index ab1a3b51e402..876f9b389f41 100644
--- a/metadata/md5-cache/dev-java/jsr101-1.4-r3
+++ b/metadata/md5-cache/dev-java/jsr101-1.4-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 java-virtuals/servlet-api:3.0 java-virtuals/saaj-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~monsieurp/packages/jsr101-1.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d5e06d884924484fad29e96438197ce
diff --git a/metadata/md5-cache/dev-java/jsr173-1.0-r1 b/metadata/md5-cache/dev-java/jsr173-1.0-r1
index f83ab7966c56..cbafaf69eed0 100644
--- a/metadata/md5-cache/dev-java/jsr173-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr173-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=bea.ri.jsr173
 RDEPEND=>=virtual/jre-1.3 dev-java/jaxme >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://ftpna2.bea.com/pub/downloads/jsr173.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b11cc2c58e1cc0f1cee405a4dfdc8530
diff --git a/metadata/md5-cache/dev-java/jsr181-1.0-r2 b/metadata/md5-cache/dev-java/jsr181-1.0-r2
index 4aa13b008868..7f26d3e6dec9 100644
--- a/metadata/md5-cache/dev-java/jsr181-1.0-r2
+++ b/metadata/md5-cache/dev-java/jsr181-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a8a80aaa75f0fd4aee74d685116c61e
diff --git a/metadata/md5-cache/dev-java/jsr223-1.0-r2 b/metadata/md5-cache/dev-java/jsr223-1.0-r2
index 5ed3596b4df3..3166c80954fe 100644
--- a/metadata/md5-cache/dev-java/jsr223-1.0-r2
+++ b/metadata/md5-cache/dev-java/jsr223-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=496e455ec521d466182a7d7615fc1a47
diff --git a/metadata/md5-cache/dev-java/jsr225-1.0 b/metadata/md5-cache/dev-java/jsr225-1.0
index 4de3b21ac7e2..7d1b7b6e35b2 100644
--- a/metadata/md5-cache/dev-java/jsr225-1.0
+++ b/metadata/md5-cache/dev-java/jsr225-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/cfoster/xqj-api-1.0.0/raw/master/javax/xml/xquery/xqj-api/1.0/xqj-api-1.0-sources.jar -> jsr225-1.0.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3a6a16c5c1d1d55a6adfe2c7f0bb818
diff --git a/metadata/md5-cache/dev-java/jsr250-1.0-r1 b/metadata/md5-cache/dev-java/jsr250-1.0-r1
index 736c49e6774e..5d7a96075e69 100644
--- a/metadata/md5-cache/dev-java/jsr250-1.0-r1
+++ b/metadata/md5-cache/dev-java/jsr250-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.java.net/maven/2/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27f2bc8c6320f220c4a3c5943644d92b
diff --git a/metadata/md5-cache/dev-java/jsr305-3.0.1 b/metadata/md5-cache/dev-java/jsr305-3.0.1
index 0269e7d9df52..c88f0a208f94 100644
--- a/metadata/md5-cache/dev-java/jsr305-3.0.1
+++ b/metadata/md5-cache/dev-java/jsr305-3.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee6349d4a0bc3f4998d6e024d2d6ffd3
diff --git a/metadata/md5-cache/dev-java/jsr311-api-1.1.1 b/metadata/md5-cache/dev-java/jsr311-api-1.1.1
index d5b6f2b1c98b..54ac1b079684 100644
--- a/metadata/md5-cache/dev-java/jsr311-api-1.1.1
+++ b/metadata/md5-cache/dev-java/jsr311-api-1.1.1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bff8f0c6d6bdb336b167fcb83416226
diff --git a/metadata/md5-cache/dev-java/jsr322-1.5 b/metadata/md5-cache/dev-java/jsr322-1.5
index 39cddf53f7d2..da14596fdcc9 100644
--- a/metadata/md5-cache/dev-java/jsr322-1.5
+++ b/metadata/md5-cache/dev-java/jsr322-1.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/javax/resource/connector-api/1.5/connector-api-1.5-sources.jar -> jsr322-1.5.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85c04afe06f0fc9e19692b114e2a14f6
diff --git a/metadata/md5-cache/dev-java/jsr67-1.3 b/metadata/md5-cache/dev-java/jsr67-1.3
index 05409aa3b14d..c089727437ad 100644
--- a/metadata/md5-cache/dev-java/jsr67-1.3
+++ b/metadata/md5-cache/dev-java/jsr67-1.3
@@ -9,5 +9,5 @@ LICENSE=sun-jsr67
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://saaj.dev.java.net/spec-1.3/saaj-api.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5dd6369925b67e4a4cd445d197c6cf2d
diff --git a/metadata/md5-cache/dev-java/jsr93-1.0-r2 b/metadata/md5-cache/dev-java/jsr93-1.0-r2
index 585a1a67a4cb..fc659cedaa3a 100644
--- a/metadata/md5-cache/dev-java/jsr93-1.0-r2
+++ b/metadata/md5-cache/dev-java/jsr93-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=sun-jsr93
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/apache/ws/scout/jaxr-api/1.0/jaxr-api-1.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b155732277a5258fa2355f3d3401084
diff --git a/metadata/md5-cache/dev-java/jss-4.3.2 b/metadata/md5-cache/dev-java/jss-4.3.2
index 1a369db84852..9894689c67e1 100644
--- a/metadata/md5-cache/dev-java/jss-4.3.2
+++ b/metadata/md5-cache/dev-java/jss-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.7.1 >=dev-libs/nss-3.12.5 >=virtual/jre-1.6 >=dev-java
 RESTRICT=test
 SLOT=3.4
 SRC_URI=https://dev.gentoo.org/~chewi/distfiles/jss-4.3.2.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35bf46e1271905a71a2d010eafa57923
diff --git a/metadata/md5-cache/dev-java/jssc-2.8.0 b/metadata/md5-cache/dev-java/jssc-2.8.0
index 8baeb23591d1..8ce6f31283d1 100644
--- a/metadata/md5-cache/dev-java/jssc-2.8.0
+++ b/metadata/md5-cache/dev-java/jssc-2.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/scream3r/jssc/2.8.0/jssc-2.8.0-sources.jar -> jssc-2.8.0.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1413f9a9687ffd15d3bebd47095a77e
diff --git a/metadata/md5-cache/dev-java/jstun-0.7.3 b/metadata/md5-cache/dev-java/jstun-0.7.3
index 7ab0bbf1012b..ea699bf07759 100644
--- a/metadata/md5-cache/dev-java/jstun-0.7.3
+++ b/metadata/md5-cache/dev-java/jstun-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 sour
 RESTRICT=test
 SLOT=0
 SRC_URI=http://jstun.javawi.de/jstun-0.7.3.src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77d1b0dbe0bce06da05b701998f2951a
diff --git a/metadata/md5-cache/dev-java/jta-1.0.1-r1 b/metadata/md5-cache/dev-java/jta-1.0.1-r1
index dca4c9b43935..8423db5438fa 100644
--- a/metadata/md5-cache/dev-java/jta-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/jta-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_0_1B-classes.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6428f8c81b9d127cfe3df408c09dd4c4
diff --git a/metadata/md5-cache/dev-java/jta-1.1 b/metadata/md5-cache/dev-java/jta-1.1
index 75a03d59f33b..2a36919af955 100644
--- a/metadata/md5-cache/dev-java/jta-1.1
+++ b/metadata/md5-cache/dev-java/jta-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jta-1_1-classes.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd9738042d804c459afda26b7ab3cf46
diff --git a/metadata/md5-cache/dev-java/jtds-1.2.5-r1 b/metadata/md5-cache/dev-java/jtds-1.2.5-r1
index 0825c4e3bbdb..bb56aa0e3d6d 100644
--- a/metadata/md5-cache/dev-java/jtds-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/jtds-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jcifs:1.1 virtual/jre:1.6 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=1.2
 SRC_URI=mirror://sourceforge/jtds/jtds-1.2.5-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=48f58907b75c4e916408f7f472b7405c
diff --git a/metadata/md5-cache/dev-java/jtds-1.3.1 b/metadata/md5-cache/dev-java/jtds-1.3.1
index 0ae00d6ba60f..74b997d04198 100644
--- a/metadata/md5-cache/dev-java/jtds-1.3.1
+++ b/metadata/md5-cache/dev-java/jtds-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/jcifs:1.1 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source
 RESTRICT=test
 SLOT=1.3
 SRC_URI=mirror://sourceforge/jtds/jtds-1.3.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1146108a3bfda1dd4a62b057b67f3645
diff --git a/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1 b/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
index cf5b2a706aee..68a267b9bbc8 100644
--- a/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
+++ b/metadata/md5-cache/dev-java/jtidy-0_pre20010801-r1
@@ -9,5 +9,5 @@ LICENSE=HTML-Tidy W3C
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jtidy/jtidy-04aug2000r7-dev.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2c58ff577ceac56876f6281028be81b
diff --git a/metadata/md5-cache/dev-java/jtidy-1.0 b/metadata/md5-cache/dev-java/jtidy-1.0
index 6d6eb9622359..6f92b1b35748 100644
--- a/metadata/md5-cache/dev-java/jtidy-1.0
+++ b/metadata/md5-cache/dev-java/jtidy-1.0
@@ -9,5 +9,5 @@ LICENSE=HTML-Tidy W3C
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jtidy/jtidy-r938-sources.zip -> jtidy-1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d85cda4fa16be77167afe1dee219d1e
diff --git a/metadata/md5-cache/dev-java/jtreemap-1.1.0 b/metadata/md5-cache/dev-java/jtreemap-1.1.0
index 4f4da9d45ada..1a570c1c6571 100644
--- a/metadata/md5-cache/dev-java/jtreemap-1.1.0
+++ b/metadata/md5-cache/dev-java/jtreemap-1.1.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jtreemap/jtreemap-1.1.0-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a19c61bee36b6be3e8b0a14ce165296f
diff --git a/metadata/md5-cache/dev-java/juel-2.1.0 b/metadata/md5-cache/dev-java/juel-2.1.0
index c6a2bc8fd108..41a04718f7eb 100644
--- a/metadata/md5-cache/dev-java/juel-2.1.0
+++ b/metadata/md5-cache/dev-java/juel-2.1.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/juel/juel-2.1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab29854b7b631039affa438bdd7d221e
diff --git a/metadata/md5-cache/dev-java/juel-2.1.0-r1 b/metadata/md5-cache/dev-java/juel-2.1.0-r1
index f70524ce98ca..bf0b5531af2b 100644
--- a/metadata/md5-cache/dev-java/juel-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/juel-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/juel/juel-2.1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c781d06994817e802da4d2e9e97cc8b
diff --git a/metadata/md5-cache/dev-java/jump-0.5 b/metadata/md5-cache/dev-java/jump-0.5
index 6eab8ba24ec6..9f60ebbad92f 100644
--- a/metadata/md5-cache/dev-java/jump-0.5
+++ b/metadata/md5-cache/dev-java/jump-0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jump-math/jump-0.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d34c450c0d79c567bde401a7e85eeeb8
diff --git a/metadata/md5-cache/dev-java/jung-1.7.6 b/metadata/md5-cache/dev-java/jung-1.7.6
index bdfdc16d73b9..a3272d3cd7df 100644
--- a/metadata/md5-cache/dev-java/jung-1.7.6
+++ b/metadata/md5-cache/dev-java/jung-1.7.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/colt:0 dev-java/commons-collections >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jung/jung-1.7.6.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3da848fe0f88d5224d3e134105002648
diff --git a/metadata/md5-cache/dev-java/jung-1.7.6-r1 b/metadata/md5-cache/dev-java/jung-1.7.6-r1
index 91cbce0939bd..9a8b266ae58b 100644
--- a/metadata/md5-cache/dev-java/jung-1.7.6-r1
+++ b/metadata/md5-cache/dev-java/jung-1.7.6-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/colt:0 dev-java/commons-collections:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jung/jung-1.7.6.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60c242bb4d4c38c79614cce756948c0b
diff --git a/metadata/md5-cache/dev-java/junit-3.8.2-r1 b/metadata/md5-cache/dev-java/junit-3.8.2-r1
index 4fff86a59fcb..bd824d5a12ed 100644
--- a/metadata/md5-cache/dev-java/junit-3.8.2-r1
+++ b/metadata/md5-cache/dev-java/junit-3.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit/junit3.8.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c7c1ea670d729624099df8e5f189076f
diff --git a/metadata/md5-cache/dev-java/junit-4.10 b/metadata/md5-cache/dev-java/junit-4.10
index 0649e1e034af..e4dbbfbbfbfd 100644
--- a/metadata/md5-cache/dev-java/junit-4.10
+++ b/metadata/md5-cache/dev-java/junit-4.10
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=mirror://github/KentBeck/junit/junit4.10.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d2eb710fd13b3eb6d5da9ce9d77465d
diff --git a/metadata/md5-cache/dev-java/junit-4.11 b/metadata/md5-cache/dev-java/junit-4.11
index a241740d934c..8512f94c1948 100644
--- a/metadata/md5-cache/dev-java/junit-4.11
+++ b/metadata/md5-cache/dev-java/junit-4.11
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=mirror://github/junit-team/junit/junit4.11.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a680e541e73cc8f977fc8a87bd9eb4bf
diff --git a/metadata/md5-cache/dev-java/junit-4.12-r1 b/metadata/md5-cache/dev-java/junit-4.12-r1
index e9a0dd1d7015..47cb297d50b9 100644
--- a/metadata/md5-cache/dev-java/junit-4.12-r1
+++ b/metadata/md5-cache/dev-java/junit-4.12-r1
@@ -9,5 +9,5 @@ LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.6 dev-java/hamcrest-core:1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/junit-team/junit/archive/r4.12.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdee92459ac0f3d2228a52dddcabc36e
diff --git a/metadata/md5-cache/dev-java/junit-addons-1.4-r1 b/metadata/md5-cache/dev-java/junit-addons-1.4-r1
index 9284a15b9256..d150807c27bb 100644
--- a/metadata/md5-cache/dev-java/junit-addons-1.4-r1
+++ b/metadata/md5-cache/dev-java/junit-addons-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/junit:0 dev-java/ant-core:0 dev-java/jdom:0 dev-java/jaxen:1.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/junit-addons/junit-addons-1.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=28e01f74b288e985e0d13b7a28b36218
diff --git a/metadata/md5-cache/dev-java/junitperf-1.9.1-r1 b/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
index 856eb6545b1e..cd7d8dfed76d 100644
--- a/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
+++ b/metadata/md5-cache/dev-java/junitperf-1.9.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.clarkware.com/software/junitperf-1.9.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d960c06014cb1b271a61e7e219e6f3d
diff --git a/metadata/md5-cache/dev-java/junrar-0.6 b/metadata/md5-cache/dev-java/junrar-0.6
index 2254b40f2016..3bbcb98a98aa 100644
--- a/metadata/md5-cache/dev-java/junrar-0.6
+++ b/metadata/md5-cache/dev-java/junrar-0.6
@@ -9,5 +9,5 @@ LICENSE=unRAR
 RDEPEND=dev-java/commons-logging:0 dev-java/commons-vfs:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/edmund-wagner/junrar/archive/junrar-0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ad6710a35583d6875c32c9f352f1def
diff --git a/metadata/md5-cache/dev-java/jupidator-0.6.0 b/metadata/md5-cache/dev-java/jupidator-0.6.0
index 2df2b520b99a..be7f3280e1d1 100644
--- a/metadata/md5-cache/dev-java/jupidator-0.6.0
+++ b/metadata/md5-cache/dev-java/jupidator-0.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/ant-core >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jupidator/jupidator.0.6.0.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92649537d35d888d2c47387758ca8f89
diff --git a/metadata/md5-cache/dev-java/jusb-0.4.4-r1 b/metadata/md5-cache/dev-java/jusb-0.4.4-r1
index 8ee195bf4050..71d43c351782 100644
--- a/metadata/md5-cache/dev-java/jusb-0.4.4-r1
+++ b/metadata/md5-cache/dev-java/jusb-0.4.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jusb/jusb-0.4.4-src.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=01c73dca391fc2563757adc10c344e1b
diff --git a/metadata/md5-cache/dev-java/jutils-1.0.0-r1 b/metadata/md5-cache/dev-java/jutils-1.0.0-r1
index d9a58cdf4cae..8f75d0e5bfd5 100644
--- a/metadata/md5-cache/dev-java/jutils-1.0.0-r1
+++ b/metadata/md5-cache/dev-java/jutils-1.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/net/java/jutils/jutils/1.0.0/jutils-1.0.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3458fe9d32afe3173e1516544606ba9
diff --git a/metadata/md5-cache/dev-java/jvmstat-3.0 b/metadata/md5-cache/dev-java/jvmstat-3.0
index c8c0ee4279ec..ae78aa8db690 100644
--- a/metadata/md5-cache/dev-java/jvmstat-3.0
+++ b/metadata/md5-cache/dev-java/jvmstat-3.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=jvmstat-3_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0b4a46e47841769b9d33f45d668aae3
diff --git a/metadata/md5-cache/dev-java/jvyaml-0.2.1-r1 b/metadata/md5-cache/dev-java/jvyaml-0.2.1-r1
index d41bb4d37d0d..8c6a5e3755a4 100644
--- a/metadata/md5-cache/dev-java/jvyaml-0.2.1-r1
+++ b/metadata/md5-cache/dev-java/jvyaml-0.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jvyaml.dev.java.net/files/documents/5215/41455/jvyaml-src-0.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2ce3215399f2a5ca81e8ff7c2346aa8c
diff --git a/metadata/md5-cache/dev-java/jvyamlb-0.2.5 b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
index ee95e420bb70..1c16dbe483e0 100644
--- a/metadata/md5-cache/dev-java/jvyamlb-0.2.5
+++ b/metadata/md5-cache/dev-java/jvyamlb-0.2.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 dev-java/bytelist:0 dev-java/jcodings:0 dev-java/joda-time:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://jvyamlb.googlecode.com/files/jvyamlb-src-0.2.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=124c0d3d8e79f84751ffbc0f3e989a95
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0 b/metadata/md5-cache/dev-java/jython-2.7.0
index 09f2c864fd76..d32e5a2221ef 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0
+++ b/metadata/md5-cache/dev-java/jython-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( readline )
 RESTRICT=test
 SLOT=2.7
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=614b2292876efae2910c72f0fe4ef574
diff --git a/metadata/md5-cache/dev-java/jzlib-1.0.7-r1 b/metadata/md5-cache/dev-java/jzlib-1.0.7-r1
index 88209740ce64..b44c91c2c8d0 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.0.7-r1
+++ b/metadata/md5-cache/dev-java/jzlib-1.0.7-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dadbb5df414f5009e97c630dcd5a01c
diff --git a/metadata/md5-cache/dev-java/jzlib-1.0.7-r2 b/metadata/md5-cache/dev-java/jzlib-1.0.7-r2
index 311c4c0e39c9..fd5e70a3b9d6 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.0.7-r2
+++ b/metadata/md5-cache/dev-java/jzlib-1.0.7-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31eff0a474886b7f3bd6e33d416d1c17
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.1 b/metadata/md5-cache/dev-java/jzlib-1.1.1
index e933648cf01f..681d96208d1a 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.1
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.1
 SRC_URI=http://www.jcraft.com/jzlib/jzlib-1.1.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aac0062d6bb0944a50ee0b233066e964
diff --git a/metadata/md5-cache/dev-java/jzlib-1.1.3 b/metadata/md5-cache/dev-java/jzlib-1.1.3
index 85b260346275..6962b5a5130f 100644
--- a/metadata/md5-cache/dev-java/jzlib-1.1.3
+++ b/metadata/md5-cache/dev-java/jzlib-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.1.3
 SRC_URI=https://github.com/ymnk/jzlib/archive/1.1.3.zip -> jzlib-1.1.3.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=982e5cc024a036111da9dd94242f20ea
diff --git a/metadata/md5-cache/dev-java/kryo-2.24.0 b/metadata/md5-cache/dev-java/kryo-2.24.0
index 576573db1fb8..7a89e3c414ec 100644
--- a/metadata/md5-cache/dev-java/kryo-2.24.0
+++ b/metadata/md5-cache/dev-java/kryo-2.24.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/objenesis:0 dev-java/reflectasm:0 dev-java/minlog:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/EsotericSoftware/kryo/archive/kryo-2.24.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=552a53c9dbd1947d0a5dfb43d2e22ab4
diff --git a/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1 b/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
index aa763740bade..02bec4fefb36 100644
--- a/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
+++ b/metadata/md5-cache/dev-java/kunststoff-2.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=2.0
 SRC_URI=http://www.incors.org/archive/kunststoff-2_0_2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2fd5e0f42578907b3b6d1b33a7814ef8
diff --git a/metadata/md5-cache/dev-java/kxml-2.3.0 b/metadata/md5-cache/dev-java/kxml-2.3.0
index 4c25f0b76273..d472c71975c7 100644
--- a/metadata/md5-cache/dev-java/kxml-2.3.0
+++ b/metadata/md5-cache/dev-java/kxml-2.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/xpp3:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/kxml/kxml2-src-2.3.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58acabebfff5c62fe38f0f0ab280e961
diff --git a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2 b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
index bf6733ed2092..1fd95e3d1248 100644
--- a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
+++ b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/l2fprod-common-7.3.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e941a0ca88bc29da2bd998722116f89
diff --git a/metadata/md5-cache/dev-java/laf-plugin-0.2-r1 b/metadata/md5-cache/dev-java/laf-plugin-0.2-r1
index b6e56a1a6883..d6c5cbc7d9de 100644
--- a/metadata/md5-cache/dev-java/laf-plugin-0.2-r1
+++ b/metadata/md5-cache/dev-java/laf-plugin-0.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/laf-plugin-0.2-src.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=641c34d9dcaf743ac0dae20d6c2ee7c3
diff --git a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4 b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
index 58ad797f5c88..bff332b546dc 100644
--- a/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
+++ b/metadata/md5-cache/dev-java/ldapsdk-4.1.7-r4
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/jss:3.4 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.1
 SRC_URI=http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e08f92287e522d2718e339a5d29bface
diff --git a/metadata/md5-cache/dev-java/libg-2.1.0-r1 b/metadata/md5-cache/dev-java/libg-2.1.0-r1
index fd46c48b6fe4..55a53b35d7c6 100644
--- a/metadata/md5-cache/dev-java/libg-2.1.0-r1
+++ b/metadata/md5-cache/dev-java/libg-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bndtools/bnd/archive/2.1.0.REL.tar.gz -> bndlib-2.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1cdc8377aef338e4276ee92c27ea9d0f
diff --git a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1 b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
index 9d483a4dc0f5..d5d312f5265d 100644
--- a/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
+++ b/metadata/md5-cache/dev-java/libmatthew-java-0.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.matthew.ath.cx/projects/java/libmatthew-java-0.7.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fdf6207db380d6d5c9c8cab8eff029c
diff --git a/metadata/md5-cache/dev-java/libmso-0.1 b/metadata/md5-cache/dev-java/libmso-0.1
index 6f8cc2937dcf..84b3243c74ba 100644
--- a/metadata/md5-cache/dev-java/libmso-0.1
+++ b/metadata/md5-cache/dev-java/libmso-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 sys-apps/hwinfo dev-java/jinklevel:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mso.googlecode.com/files/libmso-0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cfa222c8797bf851d4aa52b05756aecb
diff --git a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3 b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
index b4bba5d3f73a..6601c4952f52 100644
--- a/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
+++ b/metadata/md5-cache/dev-java/libreadline-java-0.8.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 sys-libs/ncurses >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/java-readline/libreadline-java-0.8.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ecdc3c223cd23e97fc21c13a3a9981c7
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17-r3 b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
index 633c505b2157..d577f85577b7 100644
--- a/metadata/md5-cache/dev-java/log4j-1.2.17-r3
+++ b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 javamail? ( dev-java/oracle-javamail:0 java-virtuals/jaf:0 ) jms? ( java-virtuals/jms:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46786f4e8d635f0f8378ef1151afa123
diff --git a/metadata/md5-cache/dev-java/logback-1.0.13-r1 b/metadata/md5-cache/dev-java/logback-1.0.13-r1
index c4666301d5f3..5af9da7a6234 100644
--- a/metadata/md5-cache/dev-java/logback-1.0.13-r1
+++ b/metadata/md5-cache/dev-java/logback-1.0.13-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( EPL-1.0 LGPL-2.1 )
 RDEPEND=dev-java/jansi:0 dev-java/janino:0 dev-java/slf4j-api:0 dev-java/oracle-javamail:0 java-virtuals/servlet-api:3.0 tomcat? ( www-servers/tomcat:7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://logback.qos.ch/dist/logback-1.0.13.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/logback/logback-1.0.13-build.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0db1da13eaa1b6715464780b2c3f180c
diff --git a/metadata/md5-cache/dev-java/lucene-1.4.3-r3 b/metadata/md5-cache/dev-java/lucene-1.4.3-r3
index f6b4a031e357..ecc25b669cd8 100644
--- a/metadata/md5-cache/dev-java/lucene-1.4.3-r3
+++ b/metadata/md5-cache/dev-java/lucene-1.4.3-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/lucene/java/archive/lucene-1.4.3-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=044c7fdb7be507d6a223afbc10bf0f79
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r1 b/metadata/md5-cache/dev-java/lucene-2.4.1-r1
index 26caf190605b..1ef6a86140ec 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=mirror://apache/lucene/java/lucene-2.4.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74da587faab26e0d6a720570e46d7624
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0 b/metadata/md5-cache/dev-java/lucene-3.5.0
index 865d7c3614c3..86baf8c397ec 100644
--- a/metadata/md5-cache/dev-java/lucene-3.5.0
+++ b/metadata/md5-cache/dev-java/lucene-3.5.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.5
 SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a292ecee3c93f5b8dd619f80f49598d
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2 b/metadata/md5-cache/dev-java/lucene-3.6.2
index 97f99668be89..56d3462a4aba 100644
--- a/metadata/md5-cache/dev-java/lucene-3.6.2
+++ b/metadata/md5-cache/dev-java/lucene-3.6.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 contrib? ( dev-java/commons-beanutils:1.7 >=dev-java/commons-codec-1.6:0 dev-java/commons-collections:0 dev-java/commons-compress:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/jakarta-regexp:1.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.6
 SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=88956955028300f3cb5b46c2ac7c44be
diff --git a/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1 b/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
index 62e24a6c266a..ecd74f0a6257 100644
--- a/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
+++ b/metadata/md5-cache/dev-java/lucene-analyzers-1.9.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.9
 SRC_URI=mirror://apache/lucene/java/lucene-1.9.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5362be898a16e19ccb7efc52281dd523
diff --git a/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2 b/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
index fe6e4845e18b..c8be0645c7e8 100644
--- a/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
+++ b/metadata/md5-cache/dev-java/lucene-analyzers-2.3.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/lucene/java/lucene-2.3.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84015ae3faaa88e619cb14e6e7ceae58
diff --git a/metadata/md5-cache/dev-java/lzma-9.18 b/metadata/md5-cache/dev-java/lzma-9.18
index 916fb3b214c5..069c9b40c618 100644
--- a/metadata/md5-cache/dev-java/lzma-9.18
+++ b/metadata/md5-cache/dev-java/lzma-9.18
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sevenzip/lzma918.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d977c02f84a6326c5e9997c2710875c
diff --git a/metadata/md5-cache/dev-java/lzmajio-0.95-r1 b/metadata/md5-cache/dev-java/lzmajio-0.95-r1
index d47ef8dac10a..a5f184faecc0 100644
--- a/metadata/md5-cache/dev-java/lzmajio-0.95-r1
+++ b/metadata/md5-cache/dev-java/lzmajio-0.95-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/lzma:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://comsci.liu.edu/~league/dist/lzmajio/lzmajio-0.95.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cd582dbc79969d72b8792a7e944daa0
diff --git a/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12 b/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
index 17bf3fbd116e..bbc327a7ee05 100644
--- a/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
+++ b/metadata/md5-cache/dev-java/matrix-toolkits-java-0.9.12
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://matrix-toolkits-java.googlecode.com/files/mtj-0.9.12.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2f039686c9fac42a9877b10b54034ca
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2 b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
index 41014970a2ca..440ab4317e72 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-2.0.11-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 app-eselect/eselect-java >=dev-java/java-config-2.2.0
 SLOT=2.0
 SRC_URI=mirror://apache/maven/maven-2/2.0.11/binaries/apache-maven-2.0.11-bin.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d8d7d5388546747a854183929f8a53a
diff --git a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2 b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
index 267e2f662cb8..49be7bd54eac 100644
--- a/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
+++ b/metadata/md5-cache/dev-java/maven-bin-2.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java >=dev-java/java-config-2.2.0
 SLOT=2.2
 SRC_URI=mirror://apache/maven/maven-2/2.2.1/binaries/apache-maven-2.2.1-bin.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08b15e8b54ccaf44d1939a34c053b3b6
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1 b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
index 9bdd7d9dfe30..33eb4db7c21f 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.0.4-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java >=dev-java/java-config-2.2.0
 SLOT=3.0
 SRC_URI=mirror://apache/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3f815ed8533b42fe84d6427f8ac4e48
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.1.1 b/metadata/md5-cache/dev-java/maven-bin-3.1.1
index 5b4f11b5efe8..3672dc6820a8 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.1.1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0
 SLOT=3.1
 SRC_URI=mirror://apache/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2f5cdac03f2d34570dcb1878b883431
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.2.5 b/metadata/md5-cache/dev-java/maven-bin-3.2.5
index 3a8ad44c9d59..94f9912bc6a0 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.2.5
+++ b/metadata/md5-cache/dev-java/maven-bin-3.2.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.6 >=virtual/jre-1.6 app-eselect/eselect-java || ( dev-java/commons-logging:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 ) dev-java/aopalliance:1 dev-java/avalon-framework:4.1 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/javax-inject:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/juel:0 dev-java/osgi-core-api:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0
 SLOT=3.2
 SRC_URI=mirror://apache/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=075e8dddd93bae82404fb6a43e427173
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.3.3-r1 b/metadata/md5-cache/dev-java/maven-bin-3.3.3-r1
index c9a280da688f..ba04a78b7489 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.3.3-r1
+++ b/metadata/md5-cache/dev-java/maven-bin-3.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=3.3
 SRC_URI=mirror://apache/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b9a56c796d94e4e088852435e523d6b4
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.3.9 b/metadata/md5-cache/dev-java/maven-bin-3.3.9
index f548bafd2d5d..6486a2f27476 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.3.9
+++ b/metadata/md5-cache/dev-java/maven-bin-3.3.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/juel:0 dev-java/log4j:0 dev-java/jsoup:0 dev-java/jsr250:0 dev-java/commons-io:1 dev-java/aopalliance:1 dev-java/commons-cli:1 dev-java/javax-inject:0 dev-java/osgi-core-api:0 dev-java/commons-logging:0 java-virtuals/interceptor-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=3.3
 SRC_URI=mirror://apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e924ceeb331f1db22f9d4d905f36cae
diff --git a/metadata/md5-cache/dev-java/mchange-commons-0.2.10 b/metadata/md5-cache/dev-java/mchange-commons-0.2.10
index 3566517d64a4..152aa885092f 100644
--- a/metadata/md5-cache/dev-java/mchange-commons-0.2.10
+++ b/metadata/md5-cache/dev-java/mchange-commons-0.2.10
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 dev-java/typesafe-config:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/swaldman/mchange-commons-java/archive/mchange-commons-java-0.2.10.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc34f7e15945cbd4185a1374103ccebd
diff --git a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765 b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
index 3df5ccef5e20..cbc32bdb3f8b 100644
--- a/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
+++ b/metadata/md5-cache/dev-java/mersennetwister-0_pre23765
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mersennetwister-0_pre23765.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ec1e85cde7717c315a9751c0063cbae
diff --git a/metadata/md5-cache/dev-java/metadata-extractor-2.8.1 b/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
index c658824c3f0a..2e2d3d0eae23 100644
--- a/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
+++ b/metadata/md5-cache/dev-java/metadata-extractor-2.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/xmpcore:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/drewnoakes/metadata-extractor/archive/2.8.1.tar.gz -> metadata-extractor-2.8.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be5c459ea7e6eb781dc4eafd67a38c3e
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.6 b/metadata/md5-cache/dev-java/metainf-services-1.6
index 1d71d163f9aa..503a7f468188 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.6
+++ b/metadata/md5-cache/dev-java/metainf-services-1.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56fe570117a2c18874ca437d753af66d
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4 b/metadata/md5-cache/dev-java/microba-0.4.4
index cf15a29953fe..2e5e232fef3b 100644
--- a/metadata/md5-cache/dev-java/microba-0.4.4
+++ b/metadata/md5-cache/dev-java/microba-0.4.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/jgraph-5.9.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/microba/microba-0.4.4-full.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e92f78ed5fc86511f1ada21f370aa716
diff --git a/metadata/md5-cache/dev-java/miglayout-4.0 b/metadata/md5-cache/dev-java/miglayout-4.0
index 31c33f2667a5..0ce834fc5e63 100644
--- a/metadata/md5-cache/dev-java/miglayout-4.0
+++ b/metadata/md5-cache/dev-java/miglayout-4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=swt? ( dev-java/swt:3.7 ) >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c95afb0254c3006a3d154b1204c861f
diff --git a/metadata/md5-cache/dev-java/milton-api-2.7.1.3 b/metadata/md5-cache/dev-java/milton-api-2.7.1.3
index f118bb1ad535..35b6c8cefe6c 100644
--- a/metadata/md5-cache/dev-java/milton-api-2.7.1.3
+++ b/metadata/md5-cache/dev-java/milton-api-2.7.1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-codec:0 dev-java/commons-io:1 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://milton.io/maven/io/milton/milton-api/2.7.1.3/milton-api-2.7.1.3-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b113867e1b33e09a913a5d02111e68e
diff --git a/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3 b/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
index 7e945f872427..1e080b01ae34 100644
--- a/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
+++ b/metadata/md5-cache/dev-java/milton-mail-api-2.7.1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/slf4j-api:0 dev-java/milton-api:0 dev-java/oracle-javamail:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://milton.io/maven/io/milton/milton-mail-api/2.7.1.3/milton-mail-api-2.7.1.3-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62d17024f249bfbce540173937e41a53
diff --git a/metadata/md5-cache/dev-java/mimepull-1.8 b/metadata/md5-cache/dev-java/mimepull-1.8
index 1f0edd5bc833..5a04e40f07ce 100644
--- a/metadata/md5-cache/dev-java/mimepull-1.8
+++ b/metadata/md5-cache/dev-java/mimepull-1.8
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/mimepull-1.8.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33bf03a28f5f9915c4a72ac600aa0935
diff --git a/metadata/md5-cache/dev-java/mimepull-1.9.6-r1 b/metadata/md5-cache/dev-java/mimepull-1.9.6-r1
index 8ab75b12f12f..d6d2355df576 100644
--- a/metadata/md5-cache/dev-java/mimepull-1.9.6-r1
+++ b/metadata/md5-cache/dev-java/mimepull-1.9.6-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/jvnet/mimepull/mimepull/1.9.6/mimepull-1.9.6-sources.jar -> mimepull-1.9.6.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d0c13e32b75c5feb043c525c591a82f
diff --git a/metadata/md5-cache/dev-java/mina-core-1.1.7 b/metadata/md5-cache/dev-java/mina-core-1.1.7
index daeb0d88e615..a51473f93ce8 100644
--- a/metadata/md5-cache/dev-java/mina-core-1.1.7
+++ b/metadata/md5-cache/dev-java/mina-core-1.1.7
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/mina-core-1.1.7-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5302b50e9d22ae0951da4c140f90803f
diff --git a/metadata/md5-cache/dev-java/minlog-1.2 b/metadata/md5-cache/dev-java/minlog-1.2
index 6492229cf4ca..3ecc3f0e71a7 100644
--- a/metadata/md5-cache/dev-java/minlog-1.2
+++ b/metadata/md5-cache/dev-java/minlog-1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://minlog.googlecode.com/files/minlog-1.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c48db2c18027ea23d6b3b00992cbf3e5
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r1 b/metadata/md5-cache/dev-java/mockito-1.9.5-r1
index 6f169278ee64..806209e083f7 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r1
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/junit:4 dev-java/objenesis:0 dev-java/hamcrest-core:0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f9c02ea1b5289b24ee3033d65228db36
diff --git a/metadata/md5-cache/dev-java/mojarra-2.2.12-r1 b/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
index 173d0b9fa693..504539c2a009 100644
--- a/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
+++ b/metadata/md5-cache/dev-java/mojarra-2.2.12-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 dev-java/glassfish-persistence:0 dev-java/glassfish-ejb-api:0 java-virtuals/servlet-api:3.0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 dev-java/validation-api:1.0 dev-java/javax-inject:0 dev-java/cdi-api:1.2 >=dev-java/java-config-2.2.0
 SLOT=2.2
 SRC_URI=https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/2.2.12/javax.faces-2.2.12-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eec97801f9b049e73d55526b41007ff6
diff --git a/metadata/md5-cache/dev-java/msv-20130601 b/metadata/md5-cache/dev-java/msv-20130601
index 360d07497017..3a49e602410c 100644
--- a/metadata/md5-cache/dev-java/msv-20130601
+++ b/metadata/md5-cache/dev-java/msv-20130601
@@ -9,5 +9,5 @@ LICENSE=BSD Apache-2.0
 RDEPEND=dev-java/iso-relax:0 dev-java/relaxng-datatype:0 dev-java/xsdlib:0 dev-java/xerces:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=net/java/dev/msv/msv-core/2013.6.1/msv-core-2013.6.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d820a8775b4e7d0b2203d27349efaa4
diff --git a/metadata/md5-cache/dev-java/myfaces-api-2.2.8 b/metadata/md5-cache/dev-java/myfaces-api-2.2.8
index 49326474350a..075027edc340 100644
--- a/metadata/md5-cache/dev-java/myfaces-api-2.2.8
+++ b/metadata/md5-cache/dev-java/myfaces-api-2.2.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/cdi-api:1.2 dev-java/javax-inject:0 dev-java/tomcat-jstl-spec:0 dev-java/validation-api:1.0 dev-java/tomcat-servlet-api:3.0 dev-java/myfaces-builder-annotations:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/apache/myfaces/core/myfaces-api/2.2.8/myfaces-api-2.2.8-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3dfa21695aadae1db703e9236b27d5ea
diff --git a/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9 b/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
index ca5970821c6d..ef2245a39c3f 100644
--- a/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
+++ b/metadata/md5-cache/dev-java/myfaces-builder-annotations-1.0.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/myfaces-builder-annotations/1.0.9/myfaces-builder-annotations-1.0.9-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9645949379c813649f98993dd2a395f9
diff --git a/metadata/md5-cache/dev-java/nachocalendar-0.23 b/metadata/md5-cache/dev-java/nachocalendar-0.23
index 6e8e9af33e70..ea36c2292a00 100644
--- a/metadata/md5-cache/dev-java/nachocalendar-0.23
+++ b/metadata/md5-cache/dev-java/nachocalendar-0.23
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/nachocalendar/nachocalendar-src-0.23.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82d78bf4e6835211990c32b9ecbad1ed
diff --git a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1 b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
index aa1b61ce112a..74b7d87a63de 100644
--- a/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
+++ b/metadata/md5-cache/dev-java/nailgun-0.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 !app-editors/ng >=dev-java/java-config-2.2.0 source? (
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nailgun/nailgun-src-0.7.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5bee4e6c6d05f3b3f033be18b368d531
diff --git a/metadata/md5-cache/dev-java/nanoxml-2.2.3-r2 b/metadata/md5-cache/dev-java/nanoxml-2.2.3-r2
index c72c1c39e256..d50dd0152608 100644
--- a/metadata/md5-cache/dev-java/nanoxml-2.2.3-r2
+++ b/metadata/md5-cache/dev-java/nanoxml-2.2.3-r2
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=virtual/jre-1.4 dev-java/sax >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://nanoxml.cyberelf.be/downloads/NanoXML-2.2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b064317c940e058bd09ae5bf80dbd08
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1 b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
index 9b3979c19d32..910de764ffdf 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49ebb3cb7fd7e8c159e255a13210532f
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
index b3de7ef2c29d..f73fda1d1807 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e0de9f07da41213b63e0da9e9b146e6
diff --git a/metadata/md5-cache/dev-java/netbeans-apisupport-8.1 b/metadata/md5-cache/dev-java/netbeans-apisupport-8.1
index 87c4beb3940c..2fb708159cc6 100644
--- a/metadata/md5-cache/dev-java/netbeans-apisupport-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-apisupport-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-harness-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-java-8.1 ~dev-java/netbeans-platform-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e4ea8691ea35fe5b53e461b891b74e8
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2 b/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
index b873820adb43..b592d0720e92 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-dlight-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/24C58A1D3C410AD3E23CD828871630C17068B238-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/2BCF2047382FB68A2F275677745C80E79B4046AB-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e74eeb4790f0f8ef2c02768dd3e9918
diff --git a/metadata/md5-cache/dev-java/netbeans-cnd-8.1 b/metadata/md5-cache/dev-java/netbeans-cnd-8.1
index 4053247b5108..4c1568277c93 100644
--- a/metadata/md5-cache/dev-java/netbeans-cnd-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-cnd-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-dlight-8.1 ~dev-java/netbeans-harness-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-platform-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/99529DC0E1426A102A98EF5494B6F6AA6E497F62-clank_0.3.6.zip http://hg.netbeans.org/binaries/BF2C234985CF9BD6CDE18114406C67EC7C32B84A-cnd-build-trace-1.0.zip http://hg.netbeans.org/binaries/BB83D4F8047D608858154CB041054F5CAE35B903-cnd-rfs-1.0.zip http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8a7127acad2a7bbc3d451a2e68b64a07
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2 b/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
index 66411df2032a..0bbb24d82a63 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/457A4C66AE33D1D5887BB1F359EEA41A10EBB2AB-fs_server-1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da622053d5e617fe41c0b74b5ae92c56
diff --git a/metadata/md5-cache/dev-java/netbeans-dlight-8.1 b/metadata/md5-cache/dev-java/netbeans-dlight-8.1
index 9d470979dcce..24b77d6afe78 100644
--- a/metadata/md5-cache/dev-java/netbeans-dlight-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-dlight-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-platform-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/51AC4960C19CF4C2CCA636765BFBC09A5029BFC5-fs_server-1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf00ec716e5b3d9153fec20c87365942
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
index 0c64c4219613..901b6b0e106b 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-profiler-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-webcommon-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/antlr:0[java(+)] dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-validator:0 dev-java/jakarta-oro:2.0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=12d5885bd38cb4d81baea4dab3d469a6
diff --git a/metadata/md5-cache/dev-java/netbeans-enterprise-8.1-r1 b/metadata/md5-cache/dev-java/netbeans-enterprise-8.1-r1
index 1f15cdefff88..d355f1e00403 100644
--- a/metadata/md5-cache/dev-java/netbeans-enterprise-8.1-r1
+++ b/metadata/md5-cache/dev-java/netbeans-enterprise-8.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-harness-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-java-8.1 ~dev-java/netbeans-profiler-8.1 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-webcommon-8.1 ~dev-java/netbeans-websvccommon-8.1 dev-java/commons-codec:0 dev-java/commons-fileupload:0 dev-java/commons-logging:0 dev-java/glassfish-deployment-api:1.2 dev-java/antlr:0[java(+)] dev-java/bsf:2.3 dev-java/cglib:3 dev-java/commons-beanutils:1.7 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-io:1 dev-java/commons-validator:0 dev-java/glassfish-persistence:0 dev-java/guava:14 dev-java/jakarta-oro:2.0 dev-java/osgi-core-api:0 dev-java/validation-api:1.0 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b50fad01e14a3b34ffc841fd20290402
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
index a7f520b8d2e0..8de25965f895 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-nb-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3b954a6ce6ebbed5d231924c5bc873f
diff --git a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1 b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1
index 8bd3fb65dcc6..2b405dcd0d65 100644
--- a/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-ergonomics-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-nb-8.1 ~dev-java/netbeans-platform-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ed7b4eff4766c93719d7721cb92f7c3
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.0.2 b/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
index 81e85e6b50dd..5ac32cccf8f9 100644
--- a/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-extide-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c0b0cdc117ad9c021913b76f755dc88
diff --git a/metadata/md5-cache/dev-java/netbeans-extide-8.1 b/metadata/md5-cache/dev-java/netbeans-extide-8.1
index 24358d73a61a..0124b37a1fe5 100644
--- a/metadata/md5-cache/dev-java/netbeans-extide-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-extide-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-platform-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip http://hg.netbeans.org/binaries/95CCE237B1E9390FBED0440B601822813DB220E6-ant-misc-1.9.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e359c47bb4286db361a536db5b353fa5
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2 b/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
index 0e744c7d3642..2b3866a3f9ab 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c45745ea7a3c12a90820000af1f5bfcd
diff --git a/metadata/md5-cache/dev-java/netbeans-groovy-8.1 b/metadata/md5-cache/dev-java/netbeans-groovy-8.1
index 03bfc2701a33..9d4b49d1fdc9 100644
--- a/metadata/md5-cache/dev-java/netbeans-groovy-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-groovy-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-java-8.1 ~dev-java/netbeans-platform-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/C136AE67C3C40740AE986582BAF65BA5C5CE69A0-groovy-all-2.1.7.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4ea993d201f81256d15f9274a827529
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.0.2 b/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
index 736d958ea3d5..e7c36069ae3e 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-harness-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 dev-java/javahelp:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d26678490ffb13550508c0683fd9d00
diff --git a/metadata/md5-cache/dev-java/netbeans-harness-8.1 b/metadata/md5-cache/dev-java/netbeans-harness-8.1
index cbf96e8546e3..d5ea8ec918d4 100644
--- a/metadata/md5-cache/dev-java/netbeans-harness-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-harness-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 dev-java/javahelp:0 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b477d60e57393680f28f0c5286053d89
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.0.2 b/metadata/md5-cache/dev-java/netbeans-ide-8.0.2
index 505d882cd450..fe77b4cac3e5 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-ide-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-platform-8.0.2 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/icu4j:4.4 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip http://hg.netbeans.org/binaries/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=48845aff51004517c1f075a1fb7a9167
diff --git a/metadata/md5-cache/dev-java/netbeans-ide-8.1 b/metadata/md5-cache/dev-java/netbeans-ide-8.1
index 76780ac679ff..b1b927a645b4 100644
--- a/metadata/md5-cache/dev-java/netbeans-ide-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-ide-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-harness-8.1 ~dev-java/netbeans-platform-8.1 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/icu4j:4.4 dev-java/iso-relax:0 dev-java/jdbc-mysql:0 dev-java/jdbc-postgresql:0 >=dev-java/jsch-0.1.46:0 >=dev-java/json-simple-1.1:0 dev-java/jsr173:0 dev-java/jzlib:0 dev-java/jvyamlb:0 dev-java/log4j:0 dev-java/lucene:3.5 dev-java/rhino:1.6 dev-java/saxon:9 dev-java/smack:2.2 dev-java/sun-jaf:0 dev-java/tomcat-servlet-api:2.2 dev-java/ws-commons-util:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c765370f562ac675b0e03b932e8ee23c
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r4 b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r4
index b4140eacf681..4c99f9f67a9c 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r4
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.0.2-r4
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 dev-java/absolutelayout:0 dev-java/antlr:0[java(+)] dev-java/c3p0:0 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jtidy:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/2B9EAB164D8748F9793F6A0D29B6463E97B284DA-indexer-core-5.1.1.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/E5579EF3B0C1EF2F43562DD0C3B32F8E1F603B49-nb-javac-api.jar http://hg.netbeans.org/binaries/8BDE88C9512D8783E64788F32A50E4CCBC48485E-nb-javac-impl.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a670dd9b81ca5e9af72d88c45d47ec3
diff --git a/metadata/md5-cache/dev-java/netbeans-java-8.1-r2 b/metadata/md5-cache/dev-java/netbeans-java-8.1-r2
index 5f4a96aef45f..b9158f0804ee 100644
--- a/metadata/md5-cache/dev-java/netbeans-java-8.1-r2
+++ b/metadata/md5-cache/dev-java/netbeans-java-8.1-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-harness-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-websvccommon-8.1 dev-java/beansbinding:0 dev-java/cglib:3 dev-java/jdom:0 dev-java/absolutelayout:0 dev-java/antlr:0[java(+)] dev-java/c3p0:0 dev-java/commons-cli:1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/fastinfoset:0 dev-java/glassfish-transaction-api:0 dev-java/javassist:3 dev-java/jboss-logging:0 dev-java/jsr67:0 dev-java/jsr181:0 >=dev-java/jtidy-1:0 dev-java/log4j:0 dev-java/mimepull:0 dev-java/oracle-javamail:0 dev-java/saaj:0 dev-java/slf4j-api:0 dev-java/slf4j-log4j12:0 dev-java/slf4j-simple:0 dev-java/stax-ex:0 dev-java/stax2-api:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar http://hg.netbeans.org/binaries/FBC85B83A93F76A159C8C0D782F02AF7E68E8ECF-nb-javac-impl.jar http://hg.netbeans.org/binaries/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip http://hg.netbeans.org/binaries/B572007A07023ADF7ECBDB7FC2D572BF1BDED20D-wagon-http-2.8-shaded.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=583f8de9d3059e0da2ad911819a24c11
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
index 123a52f76a9d..20aeb6478f77 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 dev-java/ant-contrib:0 dev-java/asm:3 dev-java/bcel:0 dev-java/commons-cli:1 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c91b9e1e7753515f588c03eaf3915544
diff --git a/metadata/md5-cache/dev-java/netbeans-javacard-8.1 b/metadata/md5-cache/dev-java/netbeans-javacard-8.1
index 1bd28f9c1b2f..bb226138c9f4 100644
--- a/metadata/md5-cache/dev-java/netbeans-javacard-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-javacard-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-java-8.1 ~dev-java/netbeans-platform-8.1 dev-java/ant-contrib:0 dev-java/asm:3 dev-java/bcel:0 dev-java/commons-cli:1 dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=57a8abf5bbc62c5457854909684a5a3c
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
index d1dbdc280f68..9873e44f882c 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=24fa672476855b920a55d3a67be613f6
diff --git a/metadata/md5-cache/dev-java/netbeans-javadoc-8.1 b/metadata/md5-cache/dev-java/netbeans-javadoc-8.1
index f08b98f20e30..154b6b34141d 100644
--- a/metadata/md5-cache/dev-java/netbeans-javadoc-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-javadoc-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/22CB933E3A1450B092C45785C187837E97523F5C-ant-libs-1.9.4.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=69ad39f9bacc7c1c3887fc296bd35982
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2 b/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
index 20933155ce8a..009b3537648e 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar http://hg.netbeans.org/binaries/0F7FC8D69950B86D5F67529B5C551DB84C5BCF87-nb-javac-api.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=756e74d43846705479cf8b09cd767cb0
diff --git a/metadata/md5-cache/dev-java/netbeans-javafx-8.1 b/metadata/md5-cache/dev-java/netbeans-javafx-8.1
index ac93e47dcd05..f357d04e0b67 100644
--- a/metadata/md5-cache/dev-java/netbeans-javafx-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-javafx-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-java-8.1 ~dev-java/netbeans-platform-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar http://hg.netbeans.org/binaries/B2EB2006BCDB022420BDB4C2D596564539C65699-nb-javac-api.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82282cabead81caa90dd96d4306ffc64
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2 b/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
index e973ee146e4d..172bea0f852b 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-apisupport-8.0.2 ~dev-java/netbeans-enterprise-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a756d26b198c065dcf5531cefeead07
diff --git a/metadata/md5-cache/dev-java/netbeans-mobility-8.1 b/metadata/md5-cache/dev-java/netbeans-mobility-8.1
index 7399f1358e47..88e5f6d07f6a 100644
--- a/metadata/md5-cache/dev-java/netbeans-mobility-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-mobility-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-apisupport-8.1 ~dev-java/netbeans-enterprise-8.1 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-java-8.1 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-websvccommon-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=acda2ccb44ad90bb4e1f81c7d9fb974b
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.0.2 b/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
index 8589c1134434..462223bc0db0 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-nb-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 keychain? ( net-misc/keychain:0 net-misc/x11-ssh-askpass:0 ) >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a41569b7e787c0257af5576f49a2fdf
diff --git a/metadata/md5-cache/dev-java/netbeans-nb-8.1 b/metadata/md5-cache/dev-java/netbeans-nb-8.1
index 42a14a3af07c..013caa022064 100644
--- a/metadata/md5-cache/dev-java/netbeans-nb-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-nb-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-harness-8.1 ~dev-java/netbeans-ide-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46e5ad1f96f0d9ae20c7a9bd4adb4513
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.0.2 b/metadata/md5-cache/dev-java/netbeans-php-8.0.2
index 607e4bdda182..4c518165bf73 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-php-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-webcommon-8.0.2 ~dev-java/netbeans-websvccommon-8.0.2 dev-java/javacup:0 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/BFB982F9B33E2F1A1766C212C8208793F9B7E77C-phpsigfiles.zip http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8d56da10d923cfb0ce55a4144b4091d
diff --git a/metadata/md5-cache/dev-java/netbeans-php-8.1 b/metadata/md5-cache/dev-java/netbeans-php-8.1
index c272c7edf731..33cb3f572e89 100644
--- a/metadata/md5-cache/dev-java/netbeans-php-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-php-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-webcommon-8.1 ~dev-java/netbeans-websvccommon-8.1 dev-java/javacup:0 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip http://hg.netbeans.org/binaries/73E9BC8A7AF36E0C95210F61A85AFEF212AEE1A9-phpsigfiles.zip http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a05a5b1526c4aac9fbffa5429d3a2ed4
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.0.2 b/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
index 780248920db9..01bf902013b6 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-platform-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 dev-java/javahelp:0 >=dev-java/jna-3.4:0 >=dev-java/osgi-core-api-5:0 dev-java/swing-layout:1[source] >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar http://hg.netbeans.org/binaries/972E6455724DC6ADB1C1912F53B5E3D7DF20C5FD-osgi.cmpn-4.2.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip http://hg.netbeans.org/binaries/AC97B566699146713B3CF0ABC226B5C08EF7CF33-testng-6.8.1-dist.jar http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e97d3b081cb725b164b100bad508278
diff --git a/metadata/md5-cache/dev-java/netbeans-platform-8.1 b/metadata/md5-cache/dev-java/netbeans-platform-8.1
index 5c7bdf3b17bd..5bef8902ef8b 100644
--- a/metadata/md5-cache/dev-java/netbeans-platform-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-platform-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 dev-java/hamcrest-core:1.3 dev-java/javahelp:0 >=dev-java/jna-3.4:0 dev-java/junit:4[source] >=dev-java/osgi-core-api-5:0 dev-java/osgi-compendium:0 dev-java/swing-layout:1[source] dev-java/testng:0 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar http://hg.netbeans.org/binaries/A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62-ko4j-1.2.3.jar http://hg.netbeans.org/binaries/78DD1C0B4EDC348FF4DCD0616597BB809AAE248D-net.java.html-1.2.3.jar http://hg.netbeans.org/binaries/7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E-net.java.html.boot-1.2.3.jar http://hg.netbeans.org/binaries/068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar http://hg.netbeans.org/binaries/8621531E83EC4850DA61AA2266FE41105C304F40-net.java.html.boot.script-1.2.3.jar http://hg.netbeans.org/binaries/24824B1E8C2A2D3A5C471F5875BF61F27E8916DB-net.java.html.geo-1.2.3.jar http://hg.netbeans.org/binaries/F41518385DA4B5682C864F19B82C3BA4AF65AE83-net.java.html.json-1.2.3.jar http://hg.netbeans.org/binaries/989A81454D4FA962EB1C158FE794D2EB060AB9F6-net.java.html.sound-1.2.3.jar http://hg.netbeans.org/binaries/B27F1304F18FEDE876F940AEFA6C9EB5632619D7-org.eclipse.osgi_3.9.1.v20140110-1610.jar http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bf5a953df6108ddf228e6a308f2d11c6
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2 b/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
index 9298f161e9f2..cd910b1b10d9 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-java-8.0.2 ~dev-java/netbeans-platform-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6396a987bbadfb22bc4660b32162cedd
diff --git a/metadata/md5-cache/dev-java/netbeans-profiler-8.1 b/metadata/md5-cache/dev-java/netbeans-profiler-8.1
index e7b9982b327c..fb01c117a145 100644
--- a/metadata/md5-cache/dev-java/netbeans-profiler-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-profiler-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-java-8.1 ~dev-java/netbeans-platform-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31e7b897bfaf48ee8be674683299b020
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
index 031bfb2d7951..287c384df137 100644
--- a/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-webcommon-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-extide-8.0.2 ~dev-java/netbeans-ide-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 http://hg.netbeans.org/binaries/20317762D93542637CD2C6123B836C8DA267DE9D-cdnjs.zip http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar http://hg.netbeans.org/binaries/81483881778F37D0495C07323E445361084CA1DB-ios-sim http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=405a05fc732df5650e0c71edd415f76e
diff --git a/metadata/md5-cache/dev-java/netbeans-webcommon-8.1 b/metadata/md5-cache/dev-java/netbeans-webcommon-8.1
index ca7d5aa49358..00562cb1f476 100644
--- a/metadata/md5-cache/dev-java/netbeans-webcommon-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-webcommon-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-extide-8.1 ~dev-java/netbeans-ide-8.1 dev-java/commons-compress:0 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim http://hg.netbeans.org/binaries/9D29F2A9722C91A403F32971E97DD0E49E97B02E-libiDeviceNativeBinding.dylib http://hg.netbeans.org/binaries/9F0D0D95F57E73C0110FA023813A4F9756D543B1-libimobiledevice.4.dylib http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar http://hg.netbeans.org/binaries/D05B7274396C8EED185207399B6D0400DE347DB7-libusbmuxd.2.dylib
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2246f9a82118f8207d987fc063d4abd5
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
index e9a02c8338e5..9c7311939e79 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.0.2 ~dev-java/netbeans-ide-8.0.2 >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e0c03c288bbc1a072779b61d4ba651c
diff --git a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1 b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1
index d8e3a9128152..21021bae1e66 100644
--- a/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1
+++ b/metadata/md5-cache/dev-java/netbeans-websvccommon-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-platform-8.1 ~dev-java/netbeans-ide-8.1 >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8b58fed32d852d6e50a81a0aee19bcd
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.21 b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
index d5bc4b7374e1..549d88981292 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/netty-common:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46ea591e489767e3fc88c34cf9ed4030
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.32 b/metadata/md5-cache/dev-java/netty-buffer-4.0.32
index da562b77ddec..3db180a548c3 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.32
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.32
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/netty-common:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.32.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3378e89ae007da8898e78820862ecb54
diff --git a/metadata/md5-cache/dev-java/netty-codec-4.0.21 b/metadata/md5-cache/dev-java/netty-codec-4.0.21
index b86e7af875a8..6c96abedd2e0 100644
--- a/metadata/md5-cache/dev-java/netty-codec-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-codec-4.0.21
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=687a24e53129f14f5304b0d8b403fcf6
diff --git a/metadata/md5-cache/dev-java/netty-codec-4.0.32 b/metadata/md5-cache/dev-java/netty-codec-4.0.32
index 37e39afd0c24..32ba2a88c982 100644
--- a/metadata/md5-cache/dev-java/netty-codec-4.0.32
+++ b/metadata/md5-cache/dev-java/netty-codec-4.0.32
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.32.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e088ebed5d959871969a7c74b467d06
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.21 b/metadata/md5-cache/dev-java/netty-common-4.0.21
index d17b0f31c90f..08f17a5da410 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.21
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.21
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a13d2f31aa1d5a4ffa91e8d123b0827
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.32 b/metadata/md5-cache/dev-java/netty-common-4.0.32
index c0ace453b223..38441bf34a41 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.32
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.32
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/javassist:3 dev-ja
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.32.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a6b8dc1db8a24aa658ac34d6736ba07
diff --git a/metadata/md5-cache/dev-java/netty-handler-4.0.19 b/metadata/md5-cache/dev-java/netty-handler-4.0.19
index 0a69e958d488..f3de12bd4f98 100644
--- a/metadata/md5-cache/dev-java/netty-handler-4.0.19
+++ b/metadata/md5-cache/dev-java/netty-handler-4.0.19
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-codec:0 dev-java/netty-common:0 dev-java/netty-transport:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.19.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5dda08564c6f9b22042a2f64c1fba43a
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1 b/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
index e6774f7968ba..e5217da1eda4 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.21-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=215c26588b34d98c47b103e0b931e0ff
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.32 b/metadata/md5-cache/dev-java/netty-transport-4.0.32
index 45df59c673d0..cbdea0dcab37 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.32
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.32
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.32.Final.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3775feb16324202901bb3bd8b4066a8e
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3 b/metadata/md5-cache/dev-java/neuroph-2.3
index d75675c7d52b..957ec24395e3 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.3
+++ b/metadata/md5-cache/dev-java/neuroph-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3_nb.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a6c971d4df73a15ddbdb3480acdb518c
diff --git a/metadata/md5-cache/dev-java/neuroph-2.3.1 b/metadata/md5-cache/dev-java/neuroph-2.3.1
index 1cbc8f52b7d3..0c9e7c91d059 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.3.1
+++ b/metadata/md5-cache/dev-java/neuroph-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.3.1_nb.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a6c971d4df73a15ddbdb3480acdb518c
diff --git a/metadata/md5-cache/dev-java/neuroph-2.4 b/metadata/md5-cache/dev-java/neuroph-2.4
index aa24a0f2b2a4..e76a68afb7e9 100644
--- a/metadata/md5-cache/dev-java/neuroph-2.4
+++ b/metadata/md5-cache/dev-java/neuroph-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/neuroph/neuroph_2.4_nb.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b2573a719373a87554793315f934e2e
diff --git a/metadata/md5-cache/dev-java/objenesis-1.3 b/metadata/md5-cache/dev-java/objenesis-1.3
index 32a8790d5a5f..d2112e68631e 100644
--- a/metadata/md5-cache/dev-java/objenesis-1.3
+++ b/metadata/md5-cache/dev-java/objenesis-1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://objenesis.googlecode.com/files/objenesis-1.3-bin.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee6b7ef31c45723b36de97a15754bf93
diff --git a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1 b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
index 2555dd95d9e5..06ef05ac8769 100644
--- a/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
+++ b/metadata/md5-cache/dev-java/odfdom-0.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252Fodfdom-0.8.6-sources.zip -> odfdom-0.8.6-sources.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5ee4b04840ad7d9ad297f964c557559
diff --git a/metadata/md5-cache/dev-java/ognl-3.0.8 b/metadata/md5-cache/dev-java/ognl-3.0.8
index cc66c721d57a..bdc4dae04a50 100644
--- a/metadata/md5-cache/dev-java/ognl-3.0.8
+++ b/metadata/md5-cache/dev-java/ognl-3.0.8
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=dev-java/javassist:3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=https://github.com/jkuhnert/ognl/archive/OGNL_3_0_8.tar.gz https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e9c52173e4ede9a5bcebdcb6b85930f
diff --git a/metadata/md5-cache/dev-java/opencsv-2.3 b/metadata/md5-cache/dev-java/opencsv-2.3
index ac79fe828676..202d80ff0675 100644
--- a/metadata/md5-cache/dev-java/opencsv-2.3
+++ b/metadata/md5-cache/dev-java/opencsv-2.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencsv/opencsv-2.3-src-with-libs.tar.gz -> opencsv-2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c2097cd0ee7fac37cfdfec7428afa4f4
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
index a1cfd31d9445..82a27780a902 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.2
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.2-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f798296bdbc6fbe83623d98a005d1397
diff --git a/metadata/md5-cache/dev-java/oracle-javamail-1.5.5 b/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
index ba00b437018f..eb2ee31cd1db 100644
--- a/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
+++ b/metadata/md5-cache/dev-java/oracle-javamail-1.5.5
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/projects/javamail/downloads/download/source/javamail-1.5.5-src.zip -> oracle-javamail-1.5.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a280282b09392b9e45f9258851f1b92
diff --git a/metadata/md5-cache/dev-java/oscache-2.0.2-r3 b/metadata/md5-cache/dev-java/oscache-2.0.2-r3
index 4d39063a3829..85151e691371 100644
--- a/metadata/md5-cache/dev-java/oscache-2.0.2-r3
+++ b/metadata/md5-cache/dev-java/oscache-2.0.2-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 dev-java/commons-collections dev-java/commons-logging java-virtuals/servlet-api:2.3 java-virtuals/jms dev-java/jgroups >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://oscache.dev.java.net/files/documents/629/2653/oscache-2.0.2-full.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6576ba4e775ba591ce8b355f8ce7c063
diff --git a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1 b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
index 2fb0927854f1..f45fd6d78b73 100644
--- a/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
+++ b/metadata/md5-cache/dev-java/osgi-compendium-4.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 dev-java/osgi-foundation:0 dev-java/tomcat-servlet-api:3.0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://osgi.org/download/r4v43/osgi.cmpn-4.3.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5cbe5068fec521f198546094f7d7917
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
index a913f6bf6752..3ff4c5a68c8d 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87bebd688491eb43562769ed9a925e90
diff --git a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1 b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
index c0fa52c45387..93a0d6637b96 100644
--- a/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-core-api-5.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.core-5.0.0.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b959a33bfa87f26a6ca1d8be5e7c6ba2
diff --git a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0 b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
index 0ebfb2a09ae8..56087b48b851 100644
--- a/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
+++ b/metadata/md5-cache/dev-java/osgi-enterprise-api-5.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=http://www.osgi.org/download/r5/osgi.enterprise-5.0.0.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3124a4eeb9a314ecfa02853204dbf22d
diff --git a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1 b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
index e04c6793f4a3..cd1f0fed0f76 100644
--- a/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
+++ b/metadata/md5-cache/dev-java/osgi-foundation-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 OSGi-Specification-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tomwij/files/dist/osgi-foundation-1.2.0.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1e08d4a8ae241982edc047368dfc5f9
diff --git a/metadata/md5-cache/dev-java/osgi-obr-1.0.2 b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
index d2946a37f8b4..a8161dc61f1c 100644
--- a/metadata/md5-cache/dev-java/osgi-obr-1.0.2
+++ b/metadata/md5-cache/dev-java/osgi-obr-1.0.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/dist/felix/org.osgi.service.obr-1.0.2-project.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d22b32945e569a7eca9a98389b09f576
diff --git a/metadata/md5-cache/dev-java/pat-1.5.3-r1 b/metadata/md5-cache/dev-java/pat-1.5.3-r1
index a35ebe57158c..731f777575bb 100644
--- a/metadata/md5-cache/dev-java/pat-1.5.3-r1
+++ b/metadata/md5-cache/dev-java/pat-1.5.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.javaregex.com/binaries/patsrcfree153.jar -> pat-1.5.3.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2e09bcbff7e9e6d5e680ee905dc1b5f4
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-0.9.1 b/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
index dbd8003cff02..86a20e637ceb 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
+++ b/metadata/md5-cache/dev-java/pdf-renderer-0.9.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/projects/pdf-renderer/downloads/download/PDFRenderer-full-0.9.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75940c07ac4cd067385d3cac92c0d13c
diff --git a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5 b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
index dff9586526a1..efc895a90163 100644
--- a/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
+++ b/metadata/md5-cache/dev-java/pdf-renderer-1.0.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/org/swinglabs/pdf-renderer/1.0.5/pdf-renderer-1.0.5-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc5b25726b4b5648f5dde138ce0a3415
diff --git a/metadata/md5-cache/dev-java/pdfbox-1.8.8 b/metadata/md5-cache/dev-java/pdfbox-1.8.8
index 91ff79ec2b55..adfd560728f7 100644
--- a/metadata/md5-cache/dev-java/pdfbox-1.8.8
+++ b/metadata/md5-cache/dev-java/pdfbox-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/icu4j:4 dev-java/junit:4 dev-java/bcprov:1.45
 RESTRICT=test
 SLOT=1.8
 SRC_URI=mirror://apache/pdfbox/1.8.8/pdfbox-1.8.8-src.zip http://repo2.maven.org/maven2/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb9e16190a91a2a092cc9be1726167ed
diff --git a/metadata/md5-cache/dev-java/piccolo-1.04 b/metadata/md5-cache/dev-java/piccolo-1.04
index 1d491500d71c..b55b0df39562 100644
--- a/metadata/md5-cache/dev-java/piccolo-1.04
+++ b/metadata/md5-cache/dev-java/piccolo-1.04
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/piccolo/piccolo-1.04-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=94b8a72b1c6d61286dd977210d3fa832
diff --git a/metadata/md5-cache/dev-java/piccolo2d-3.0-r1 b/metadata/md5-cache/dev-java/piccolo2d-3.0-r1
index 114167273813..847d7ef9a09d 100644
--- a/metadata/md5-cache/dev-java/piccolo2d-3.0-r1
+++ b/metadata/md5-cache/dev-java/piccolo2d-3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/swt:3.8 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/piccolo2d/piccolo2d.java/archive/piccolo2d-complete-3.0.zip -> piccolo2d-3.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c914d50796ab9f840b7e6941e63a8f14
diff --git a/metadata/md5-cache/dev-java/picocontainer-1.1-r1 b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
index 45d3bdc995e9..c1fba72d566d 100644
--- a/metadata/md5-cache/dev-java/picocontainer-1.1-r1
+++ b/metadata/md5-cache/dev-java/picocontainer-1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=1
 SRC_URI=http://dist.codehaus.org/picocontainer/distributions/picocontainer-1.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d44a14ca1ac0235716e90cebd2671d57
diff --git a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3 b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
index c372e8c1f90e..4aaa4a7e2000 100644
--- a/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
+++ b/metadata/md5-cache/dev-java/plexus-classworlds-2.2.3
@@ -9,5 +9,5 @@ LICENSE=codehaus-classworlds
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/plexus-classworlds/plexus-classworlds-2.2.3.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b450e3fc2dbfb057baeb16d28f76e26d
diff --git a/metadata/md5-cache/dev-java/portletapi-1.0 b/metadata/md5-cache/dev-java/portletapi-1.0
index b550c1ef633b..203043119731 100644
--- a/metadata/md5-cache/dev-java/portletapi-1.0
+++ b/metadata/md5-cache/dev-java/portletapi-1.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://apache/portals/jetspeed-2/sources/jetspeed-2.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=336643f0904d946cf5afaf810167ff70
diff --git a/metadata/md5-cache/dev-java/portletapi-2.0 b/metadata/md5-cache/dev-java/portletapi-2.0
index 591565c86648..35605f17be39 100644
--- a/metadata/md5-cache/dev-java/portletapi-2.0
+++ b/metadata/md5-cache/dev-java/portletapi-2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0
 SLOT=2.0
 SRC_URI=http://mirrors.ibiblio.org/maven2/javax/portlet/portlet-api/2.0/portlet-api-2.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8474d3e15216c9b4917c33f11d5544ff
diff --git a/metadata/md5-cache/dev-java/prefuse-20071021_beta b/metadata/md5-cache/dev-java/prefuse-20071021_beta
index 9ce3eff7af19..ce35dbf603c3 100644
--- a/metadata/md5-cache/dev-java/prefuse-20071021_beta
+++ b/metadata/md5-cache/dev-java/prefuse-20071021_beta
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/lucene:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2006
 SRC_URI=mirror://sourceforge/prefuse/prefuse-beta-20071021.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4947f5d8d105497807527a7340fa61e
diff --git a/metadata/md5-cache/dev-java/proguard-4.5 b/metadata/md5-cache/dev-java/proguard-4.5
index 7c82c3f16a30..f03a2919e2e7 100644
--- a/metadata/md5-cache/dev-java/proguard-4.5
+++ b/metadata/md5-cache/dev-java/proguard-4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a9bcb7ff7ff6b3b83a0990767503d5f6
diff --git a/metadata/md5-cache/dev-java/proguard-4.7 b/metadata/md5-cache/dev-java/proguard-4.7
index 85480ec17c04..d81d4584bf0f 100644
--- a/metadata/md5-cache/dev-java/proguard-4.7
+++ b/metadata/md5-cache/dev-java/proguard-4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7aebdf33867b15f0bc88c18c953622cb
diff --git a/metadata/md5-cache/dev-java/proguard-4.8 b/metadata/md5-cache/dev-java/proguard-4.8
index 941854e9ca75..595497e89f88 100644
--- a/metadata/md5-cache/dev-java/proguard-4.8
+++ b/metadata/md5-cache/dev-java/proguard-4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.7:0 j2me? ( >=dev-java/sun-j2me-bin-2.2:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard4.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7fa22d791a1896cf4da6d182a60f41ad
diff --git a/metadata/md5-cache/dev-java/proguard-5.2.1 b/metadata/md5-cache/dev-java/proguard-5.2.1
index be32954f5202..d2fe384294d9 100644
--- a/metadata/md5-cache/dev-java/proguard-5.2.1
+++ b/metadata/md5-cache/dev-java/proguard-5.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=>=virtual/jre-1.5 >=dev-java/ant-core-1.7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/proguard/proguard5.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46cebf5d1695ed950d1b37019380faa1
diff --git a/metadata/md5-cache/dev-java/qdox-1.12-r1 b/metadata/md5-cache/dev-java/qdox-1.12-r1
index d2f59cb1c1fe..cb4021433a7f 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12-r1
+++ b/metadata/md5-cache/dev-java/qdox-1.12-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.12
 SRC_URI=http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=233d5ba6ace0c6c6105e50dae5f6c266
diff --git a/metadata/md5-cache/dev-java/qdox-1.12.1-r1 b/metadata/md5-cache/dev-java/qdox-1.12.1-r1
index d010b8eed86d..33e801267e46 100644
--- a/metadata/md5-cache/dev-java/qdox-1.12.1-r1
+++ b/metadata/md5-cache/dev-java/qdox-1.12.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.12
 SRC_URI=https://github.com/codehaus/qdox/archive/qdox-1.12.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7029821876f086a071f42f47f3ebd78
diff --git a/metadata/md5-cache/dev-java/qdox-1.6.3 b/metadata/md5-cache/dev-java/qdox-1.6.3
index 8887d7478876..3e2bd7b0eff1 100644
--- a/metadata/md5-cache/dev-java/qdox-1.6.3
+++ b/metadata/md5-cache/dev-java/qdox-1.6.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/ant-core =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=http://repository.codehaus.org/com/thoughtworks/qdox/qdox/1.6.3/qdox-1.6.3-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e32b202031a87f55238ee71686aa74f9
diff --git a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1 b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
index 3e6dd1aae27b..f17588f0931c 100644
--- a/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
+++ b/metadata/md5-cache/dev-java/radeox-1.0_beta2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 =dev-java/commons-logging-1* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=ftp://snipsnap.org/radeox/radeox-1.0-BETA-2-src.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6256687cb4ae1104a6abe855f7ea7665
diff --git a/metadata/md5-cache/dev-java/rat-0.11 b/metadata/md5-cache/dev-java/rat-0.11
index 1e32a6e66a13..c13dcde8fbf2 100644
--- a/metadata/md5-cache/dev-java/rat-0.11
+++ b/metadata/md5-cache/dev-java/rat-0.11
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 dev-java/commons-io:1 dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/commons-compress:0 dev-java/commons-collections:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/apache/rat/apache-rat-core/0.11/apache-rat-core-0.11-sources.jar https://repo1.maven.org/maven2/org/apache/rat/apache-rat-tasks/0.11/apache-rat-tasks-0.11-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b21df9c8fca62fb6c809dcd5dbd98a14
diff --git a/metadata/md5-cache/dev-java/reflectasm-1.11.0 b/metadata/md5-cache/dev-java/reflectasm-1.11.0
index b8c0aecc62cb..7691a2d8a031 100644
--- a/metadata/md5-cache/dev-java/reflectasm-1.11.0
+++ b/metadata/md5-cache/dev-java/reflectasm-1.11.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-java/asm:4 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/EsotericSoftware/reflectasm/archive/reflectasm-1.11.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed6488b51448e558965534907bd4dd4f
diff --git a/metadata/md5-cache/dev-java/reflections-0.9.9 b/metadata/md5-cache/dev-java/reflections-0.9.9
index 41438d59727f..7cc8bc13f5ff 100644
--- a/metadata/md5-cache/dev-java/reflections-0.9.9
+++ b/metadata/md5-cache/dev-java/reflections-0.9.9
@@ -9,5 +9,5 @@ LICENSE=WTFPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-vfs:2 dev-java/dom4j:1 dev-java/gson:2.2.2 dev-java/guava:18 dev-java/javassist:3 dev-java/jsr305:0 dev-java/slf4j-api:0 dev-java/tomcat-servlet-api:3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/reflections/reflections/0.9.9/reflections-0.9.9-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a03c84c38ab58d5ee9860caaccc34b8c
diff --git a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1 b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
index 9909d119d02d..b5d86a149f8f 100644
--- a/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
+++ b/metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxng/relaxngDatatype-1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f6f0778869d1c2d83ab9b1d229e3641
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r2 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r2
index b8e6d15f9835..183f1fdbfcb5 100644
--- a/metadata/md5-cache/dev-java/relaxngcc-1.12-r2
+++ b/metadata/md5-cache/dev-java/relaxngcc-1.12-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/relaxng-datatype:0 dev-java/msv:0 dev-java/ant-core:0 dev-java/xsdlib:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd9bd319ecc8eef7648e846799fb52c3
diff --git a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3 b/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
index c0abac3dbbfa..48bbc639b62d 100644
--- a/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
+++ b/metadata/md5-cache/dev-java/relaxngcc-1.12-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/msv:0 dev-java/xsdlib:0 dev-java/ant-core:0 dev-java/iso-relax:0 dev-java/relaxng-datatype:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/relaxngcc/relaxngcc-20031218.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ace40c56d0fd5985a2a4ee144f11a63
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25 b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
index 9a3aabf5f6aa..54a12c6ba154 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.0.25
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.4
 SRC_URI=http://www.caucho.com/download/resin-3.0.25-src.zip mirror://gentoo/resin-gentoo-patches-3.0.25.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e18a3aa4f5344d81b13837d58b8f7ef7
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12 b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
index 2d5e03ec537f..e638a4d2395b 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-3.1.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=http://www.caucho.com/download/resin-3.1.12-src.zip mirror://gentoo/resin-gentoo-patches-3.1.12.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec05d88ee8aba5b1fc37f39348899193
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
index 8e44260615d4..985639011793 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.26-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38a531da017257d50c3a72a6fa69bfa1
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
index a320d35e910a..e830bc77b465 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.27
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=http://www.caucho.com/download/resin-4.0.27-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abc8671627c6f92619379d092b5d4921
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
index 2cdd98421ca6..7d7cc5b922c1 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.44
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=http://www.caucho.com/download/resin-4.0.44-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0b50a6bc7f359c7b6bc285c80b53591
diff --git a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46 b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
index e863ba59fd30..4ec3ef2e31a2 100644
--- a/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
+++ b/metadata/md5-cache/dev-java/resin-servlet-api-4.0.46
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=http://www.caucho.com/download/resin-4.0.46-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0b50a6bc7f359c7b6bc285c80b53591
diff --git a/metadata/md5-cache/dev-java/rhino-1.7.7-r1 b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
index fbae77871168..d85acd559dc5 100644
--- a/metadata/md5-cache/dev-java/rhino-1.7.7-r1
+++ b/metadata/md5-cache/dev-java/rhino-1.7.7-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.6
 SRC_URI=https://github.com/mozilla/rhino/archive/Rhino1_7_7_RELEASE.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d6647bef205f3a39c48629f99ed1164a
diff --git a/metadata/md5-cache/dev-java/rngom-20100718-r1 b/metadata/md5-cache/dev-java/rngom-20100718-r1
index 7a60f193f95a..fa2ab072c7bb 100644
--- a/metadata/md5-cache/dev-java/rngom-20100718-r1
+++ b/metadata/md5-cache/dev-java/rngom-20100718-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/xsdlib:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://repo1.maven.org/maven2/org/kohsuke/rngom/rngom/20100718/rngom-20100718-sources.jar -> rngom-20100718.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f284728cfa064702c369e49ebfc3510
diff --git a/metadata/md5-cache/dev-java/rome-0.9-r2 b/metadata/md5-cache/dev-java/rome-0.9-r2
index db990ee9ca31..dc2f47a2b567 100644
--- a/metadata/md5-cache/dev-java/rome-0.9-r2
+++ b/metadata/md5-cache/dev-java/rome-0.9-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jdom:1.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/rome-0.9-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cdc1699237ed43a9c9dd25b61ddeb4c
diff --git a/metadata/md5-cache/dev-java/rundoc-0.11 b/metadata/md5-cache/dev-java/rundoc-0.11
index f249ae8cefe8..9aa16b57d631 100644
--- a/metadata/md5-cache/dev-java/rundoc-0.11
+++ b/metadata/md5-cache/dev-java/rundoc-0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.5.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.martiansoftware.com/lab/rundoc/rundoc-0.11-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=346b56e127ed2a9db2e69bcfc4e88d69
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
index fe70ad57c19e..c63c0bcf20ca 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac49d7d906489912fc479f082e6c75e1
diff --git a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1 b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1
index 87b20afd34ab..9b5da9d77d96 100644
--- a/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1
+++ b/metadata/md5-cache/dev-java/rxtx-2.2_pre2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jre-1.6 lfd? ( sys-apps/xinetd ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=384c9f6c6e1f77752f3ae5af251ca97d
diff --git a/metadata/md5-cache/dev-java/saaj-1.3.19-r1 b/metadata/md5-cache/dev-java/saaj-1.3.19-r1
index 3422ec68430d..c100cb004e2c 100644
--- a/metadata/md5-cache/dev-java/saaj-1.3.19-r1
+++ b/metadata/md5-cache/dev-java/saaj-1.3.19-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=dev-java/mimepull:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 java-virtuals/jaf:0 java-virtuals/saaj-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/saaj-1.3.19.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06eaceca0471648ee6c132ae80b9cb64
diff --git a/metadata/md5-cache/dev-java/sablecc-3.2 b/metadata/md5-cache/dev-java/sablecc-3.2
index 47b2dd874dba..c3f9931f8283 100644
--- a/metadata/md5-cache/dev-java/sablecc-3.2
+++ b/metadata/md5-cache/dev-java/sablecc-3.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sablecc/sablecc-3.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=45486fbbd7ad82a20936c99beb696c4e
diff --git a/metadata/md5-cache/dev-java/sablecc-3.7 b/metadata/md5-cache/dev-java/sablecc-3.7
index f0539fc3d3fb..dafd97196ada 100644
--- a/metadata/md5-cache/dev-java/sablecc-3.7
+++ b/metadata/md5-cache/dev-java/sablecc-3.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sablecc/sablecc-3.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99e8a215d20415ae38eea80c9f643558
diff --git a/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1 b/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1
index 02cdb2873adb..98e1dd6d7b51 100644
--- a/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/sablecc-anttask-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/sablecc >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/sablecc/sablecc-anttask-1.1.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad58ed2066f2fd7b374b27a21854e271
diff --git a/metadata/md5-cache/dev-java/sac-1.3-r1 b/metadata/md5-cache/dev-java/sac-1.3-r1
index c8d2e2605a24..5a539b273b0b 100644
--- a/metadata/md5-cache/dev-java/sac-1.3-r1
+++ b/metadata/md5-cache/dev-java/sac-1.3-r1
@@ -9,5 +9,5 @@ LICENSE=W3C
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.w3.org/2002/06/sacjava-1.3.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3d9af08f458cab056623ae7b16f3a52
diff --git a/metadata/md5-cache/dev-java/sat4j-core-2.2.0 b/metadata/md5-cache/dev-java/sat4j-core-2.2.0
index ebdf1e234593..74b6dd6e11e6 100644
--- a/metadata/md5-cache/dev-java/sat4j-core-2.2.0
+++ b/metadata/md5-cache/dev-java/sat4j-core-2.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.2.0-build.xml
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c418055e4e093a09b741c819ec442c19
diff --git a/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1 b/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
index 2887fad4f497..10288e5f83c5 100644
--- a/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/sat4j-core-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-core-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-core-2.3.1-build.xml
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ede27a2d6bcc023dfd172f5c0473454
diff --git a/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0 b/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
index 3c34d8ff7d70..11fe919c0c26 100644
--- a/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
+++ b/metadata/md5-cache/dev-java/sat4j-pseudo-2.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/sat4j-core:2 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20100623.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.2.0-build.xml
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4fcd6408c60589002a71ed69e1b1e33b
diff --git a/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1 b/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
index aec7d3e38d6b..9cb5bcec994c 100644
--- a/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
+++ b/metadata/md5-cache/dev-java/sat4j-pseudo-2.3.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/sat4j-core:2.3 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=http://download.forge.objectweb.org/sat4j/sat4j-pb-v20111030.zip http://download.forge.objectweb.org/sat4j/build-2.4.xml -> sat4j-pseudo-2.3.1-build.xml
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c7f1203fc1477ad5ec7ddf860db6124
diff --git a/metadata/md5-cache/dev-java/sax-2.2.1-r2 b/metadata/md5-cache/dev-java/sax-2.2.1-r2
index 6cd720a86932..a64609e752ca 100644
--- a/metadata/md5-cache/dev-java/sax-2.2.1-r2
+++ b/metadata/md5-cache/dev-java/sax-2.2.1-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/sax/sax2r3.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f51d9314866032f45da5ede88542563
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5 b/metadata/md5-cache/dev-java/saxon-6.5.5
index b1ad7b83f93e..702d16df92a9 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 ~dev-java/jdom-1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=mirror://sourceforge/saxon/saxon6-5-5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef1ff799914606dd8dd192131cb25026
diff --git a/metadata/md5-cache/dev-java/saxon-6.5.5-r1 b/metadata/md5-cache/dev-java/saxon-6.5.5-r1
index 966ac430aa29..7a4a4c37d809 100644
--- a/metadata/md5-cache/dev-java/saxon-6.5.5-r1
+++ b/metadata/md5-cache/dev-java/saxon-6.5.5-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/jdom:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6.5
 SRC_URI=mirror://sourceforge/saxon/saxon6-5-5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68eba903909a4ce7e2a825cd56facec7
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6 b/metadata/md5-cache/dev-java/saxon-9.2.0.6
index 7f1a0ef5012d..566473090bcc 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6
@@ -9,5 +9,5 @@ LICENSE=MPL-1.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core dev-java/dom4j:1 dev-java/jdom:1.0 dev-java/xom >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32c6cdd6dd269b2d21c32ce81385ef31
diff --git a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r1 b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r1
index 59751267d4d7..2f871b023d18 100644
--- a/metadata/md5-cache/dev-java/saxon-9.2.0.6-r1
+++ b/metadata/md5-cache/dev-java/saxon-9.2.0.6-r1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.0
 RDEPEND=>=virtual/jre-1.6 dev-java/ant-core dev-java/dom4j:1 dev-java/jdom:0 dev-java/xom >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=9
 SRC_URI=mirror://sourceforge/saxon/saxonhe9-2-0-6source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e04629f2c7117e620655d17624504131
diff --git a/metadata/md5-cache/dev-java/saxpath-1.0-r2 b/metadata/md5-cache/dev-java/saxpath-1.0-r2
index d07f0c3a6ccc..46e1ae3b2738 100644
--- a/metadata/md5-cache/dev-java/saxpath-1.0-r2
+++ b/metadata/md5-cache/dev-java/saxpath-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/saxpath/saxpath-1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd341cbb6af19df4030317ca995f59f2
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
index 8abd28924396..25104b978f9c 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aef68072b3a3704b9e2644397d522cc5
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
index 9fc85f5cf77c..417c62d0536a 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df26676baabebfc5e54b983086cf2b74
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.10_rc2 b/metadata/md5-cache/dev-java/sbt-0.13.10_rc2
index db4a66d145f7..8eb15357d0f6 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.10_rc2
+++ b/metadata/md5-cache/dev-java/sbt-0.13.10_rc2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-lang/scala:* >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.10_rc2-src.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.10_rc2-ivy2-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.10_rc2-sbt-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.10_rc2-test-deps.tar.bz2 http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.10-RC2/sbt-launch.jar -> sbt-launch-0.13.9.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.10_rc2-gentoo-binary.tar.bz2 )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20f1fe2eaf98d99bd8767e22ee8665e4
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.11 b/metadata/md5-cache/dev-java/sbt-0.13.11
new file mode 100644
index 000000000000..dcc32984a260
--- /dev/null
+++ b/metadata/md5-cache/dev-java/sbt-0.13.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.7 >=dev-lang/scala-2.10.6:2.10 >=dev-java/java-config-2.2.0
+DESCRIPTION=sbt is a build tool for Scala and Java projects that aims to do the basics well
+EAPI=5
+HOMEPAGE=http://www.scala-sbt.org/
+IUSE=binary elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.7 dev-lang/scala:* >=dev-java/java-config-2.2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.11-src.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.11-ivy2-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.11-sbt-deps.tar.bz2 http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.11/sbt-launch.jar -> sbt-launch-0.13.11.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.11-gentoo-binary.tar.bz2 )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=01313637f0ec4ff32d1058420f20bfeb
diff --git a/metadata/md5-cache/dev-java/sbt-0.13.8-r1 b/metadata/md5-cache/dev-java/sbt-0.13.8-r1
index d4152ff8b47a..d5623ab0b575 100644
--- a/metadata/md5-cache/dev-java/sbt-0.13.8-r1
+++ b/metadata/md5-cache/dev-java/sbt-0.13.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7 dev-lang/scala:* >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=!binary? ( https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-src.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-ivy2-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-sbt-deps.tar.bz2 https://dev.gentoo.org/~gienah/snapshots/sbt-0.13.8-test-deps.tar.bz2 http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.8/sbt-launch.jar -> sbt-launch-0.13.7.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/sbt-0.13.8-gentoo-binary.tar.bz2 )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a855e4f7c73a9ac45b1f5ac3a612163b
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.12.4 b/metadata/md5-cache/dev-java/sbt-bin-0.12.4
index 3462ee4bbc04..62d71da15173 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.12.4
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.12.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.12.4/sbt-0.12.4.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.13.6 b/metadata/md5-cache/dev-java/sbt-bin-0.13.6
index 87b27e261317..7f23b9bc484e 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.13.6
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.13.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.6/sbt-0.13.6.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.13.7 b/metadata/md5-cache/dev-java/sbt-bin-0.13.7
index 94cbfb4c207d..2a16bdda1d22 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.13.7
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.13.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.7/sbt-0.13.7.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.13.8 b/metadata/md5-cache/dev-java/sbt-bin-0.13.8
index 7ee9df0a123a..7aced6a12c35 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.13.8
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.13.8
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.8/sbt-0.13.8.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
diff --git a/metadata/md5-cache/dev-java/sbt-bin-0.13.9 b/metadata/md5-cache/dev-java/sbt-bin-0.13.9
index 908d5b1a23e8..a5e583e96d36 100644
--- a/metadata/md5-cache/dev-java/sbt-bin-0.13.9
+++ b/metadata/md5-cache/dev-java/sbt-bin-0.13.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !dev-java/sbt >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dl.bintray.com/sbt/native-packages/sbt/0.13.9/sbt-0.13.9.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7955c5df478eefe79f2a7b440afa05
diff --git a/metadata/md5-cache/dev-java/servletapi-2.2-r3 b/metadata/md5-cache/dev-java/servletapi-2.2-r3
index 4c148012f82e..220917f6c4ee 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.2-r3
+++ b/metadata/md5-cache/dev-java/servletapi-2.2-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://gentoo/servletapi-2.2-20021101.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ed79e5eeac15cde7b26b0c6048f17ea
diff --git a/metadata/md5-cache/dev-java/servletapi-2.3-r3 b/metadata/md5-cache/dev-java/servletapi-2.3-r3
index d1ece5103324..b21ee1540c72 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.3-r3
+++ b/metadata/md5-cache/dev-java/servletapi-2.3-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 SLOT=2.3
 SRC_URI=mirror://gentoo/servletapi-2.3-20021101.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7f05c895ec1cee883e51648bf94e8ec
diff --git a/metadata/md5-cache/dev-java/servletapi-2.4-r5 b/metadata/md5-cache/dev-java/servletapi-2.4-r5
index 50590754aa07..0910ad2eb3f6 100644
--- a/metadata/md5-cache/dev-java/servletapi-2.4-r5
+++ b/metadata/md5-cache/dev-java/servletapi-2.4-r5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0
 SLOT=2.4
 SRC_URI=http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.20/src/apache-tomcat-5.5.20-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77070ad57d1ece6b6ee1b6d357b47d28
diff --git a/metadata/md5-cache/dev-java/shared-objects-1.4-r3 b/metadata/md5-cache/dev-java/shared-objects-1.4-r3
index 1a46d915ed5f..bc802a6b1413 100644
--- a/metadata/md5-cache/dev-java/shared-objects-1.4-r3
+++ b/metadata/md5-cache/dev-java/shared-objects-1.4-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=http://www.cwi.nl/projects/MetaEnv/shared-objects/shared-objects-1.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f8bcdbb5379d7b5e51b2c33bfdc780b
diff --git a/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1 b/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
index 25d76dc02078..8da02d56a18b 100644
--- a/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
+++ b/metadata/md5-cache/dev-java/simplyhtml-0.13.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/javahelp:0 dev-java/gnu-regexp:1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/simplyhtml/SimplyHTML_src_0_13_1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be0dd21b6271863af5fd5e7a932e8210
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.1 b/metadata/md5-cache/dev-java/sjsxp-1.0.1
index 4c81d506bfd5..7547970fd2e0 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.1
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.1
@@ -9,5 +9,5 @@ LICENSE=bea.ri.jsr173
 RDEPEND=>=virtual/jre-1.5 dev-java/jsr173 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sjsxp-1.0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c37ae614f7b7ed22b8511f9e53ba95d1
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.1-r1 b/metadata/md5-cache/dev-java/sjsxp-1.0.1-r1
index 51c7c956f472..0f614d147c5d 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=bea.ri.jsr173
 RDEPEND=>=virtual/jre-1.5 java-virtuals/stax-api >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sjsxp-1.0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7eea0106ac581d6cf82e77ea26747f4
diff --git a/metadata/md5-cache/dev-java/sjsxp-1.0.1-r2 b/metadata/md5-cache/dev-java/sjsxp-1.0.1-r2
index 8e255372181b..1cb6102f9fa9 100644
--- a/metadata/md5-cache/dev-java/sjsxp-1.0.1-r2
+++ b/metadata/md5-cache/dev-java/sjsxp-1.0.1-r2
@@ -9,5 +9,5 @@ LICENSE=bea.ri.jsr173
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sjsxp-1.0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=202bcab77291ad7b251a08073a6024e5
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7-r1 b/metadata/md5-cache/dev-java/skinlf-6.7-r1
index 076f69b25378..cdee318f535f 100644
--- a/metadata/md5-cache/dev-java/skinlf-6.7-r1
+++ b/metadata/md5-cache/dev-java/skinlf-6.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f918fe4e919f13da303bf012daac7013
diff --git a/metadata/md5-cache/dev-java/slf4j-api-1.7.7 b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
index c27980a6813c..003a9dfc13e7 100644
--- a/metadata/md5-cache/dev-java/slf4j-api-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-api-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4227a46ca6de3450f049809d6911cb4d
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.5 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
index 521c9c0251d1..2c018290a7a3 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41c7c67d524602719fed1dd29525d133
diff --git a/metadata/md5-cache/dev-java/slf4j-ext-1.7.7 b/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
index 153fb2b51876..e780946fc7ec 100644
--- a/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-ext-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 dev-java/javassist:3 dev-java/cal
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3594b3fbcbef7f2df2f979d304ef9c4
diff --git a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7 b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
index 0899b4995b50..d051d46ccd26 100644
--- a/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-log4j12-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-java/log4j:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0284b80167957f1f490ac9c617fa141
diff --git a/metadata/md5-cache/dev-java/slf4j-nop-1.7.7 b/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
index 940ee8dff59d..3455267e9699 100644
--- a/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-nop-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dcff2dc8d1ab47f7c522a174af5d363
diff --git a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7 b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
index d51a5185d169..218e323c1575 100644
--- a/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
+++ b/metadata/md5-cache/dev-java/slf4j-simple-1.7.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.slf4j.org/dist/slf4j-1.7.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08ca7e2fe1bb27cacf5494f369806864
diff --git a/metadata/md5-cache/dev-java/smack-2.2.1 b/metadata/md5-cache/dev-java/smack-2.2.1
index a4292214580e..4a0133509bf1 100644
--- a/metadata/md5-cache/dev-java/smack-2.2.1
+++ b/metadata/md5-cache/dev-java/smack-2.2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/xpp3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=http://www.jivesoftware.org/builds/smack/smack-dev-2.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b85edb896e5c4c0f66bc6799ad313c1a
diff --git a/metadata/md5-cache/dev-java/snakeyaml-1.16 b/metadata/md5-cache/dev-java/snakeyaml-1.16
index c24674896167..849505f1629c 100644
--- a/metadata/md5-cache/dev-java/snakeyaml-1.16
+++ b/metadata/md5-cache/dev-java/snakeyaml-1.16
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://bitbucket.org/asomov/snakeyaml/get/v1.16.tar.bz2 -> snakeyaml-1.16.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=485a77c347a27b7eea7e782ab9eab104
diff --git a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3 b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
index c9f748f8ad47..cabcdeaee5ae 100644
--- a/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
+++ b/metadata/md5-cache/dev-java/snappy-1.0.3_rc3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://github.com/xerial/snappy-java/archive/snappy-java-1.0.3-rc3.tar.gz -> snappy-java-1.0.3_rc3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f9a8d3361ffc457fa6a635b7e8a41856
diff --git a/metadata/md5-cache/dev-java/snappy-1.1.0.1 b/metadata/md5-cache/dev-java/snappy-1.1.0.1
index 253f6dc89de1..88ab9faf8ea8 100644
--- a/metadata/md5-cache/dev-java/snappy-1.1.0.1
+++ b/metadata/md5-cache/dev-java/snappy-1.1.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/osgi-core-api:0 app-arch/snappy >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.1
 SRC_URI=https://github.com/xerial/snappy-java/archive/1.1.0.1.tar.gz -> snappy-java-1.1.0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f1fda4025885b655017f70776c1edfb
diff --git a/metadata/md5-cache/dev-java/snip-0.11 b/metadata/md5-cache/dev-java/snip-0.11
index c0987074acf1..96aa91698e6a 100644
--- a/metadata/md5-cache/dev-java/snip-0.11
+++ b/metadata/md5-cache/dev-java/snip-0.11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 >=dev-java/ant-core-1.5.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.martiansoftware.com/lab/snip/snip-0.11-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d2af89beed18a033c3f60f90967da88
diff --git a/metadata/md5-cache/dev-java/spice-jndikit-1.2 b/metadata/md5-cache/dev-java/spice-jndikit-1.2
index 93916ba5f21d..86bfdb47f46c 100644
--- a/metadata/md5-cache/dev-java/spice-jndikit-1.2
+++ b/metadata/md5-cache/dev-java/spice-jndikit-1.2
@@ -9,5 +9,5 @@ LICENSE=Spice-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dist.codehaus.org/spice/distributions/spice-jndikit-1.2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d1c86a557572982757791818df0a8f5
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r1 b/metadata/md5-cache/dev-java/spin-1.5-r1
index f659418b8608..31b9ae37a723 100644
--- a/metadata/md5-cache/dev-java/spin-1.5-r1
+++ b/metadata/md5-cache/dev-java/spin-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/spin/spin-1.5-all.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e8240fc087afff2edfe2d1089678c03
diff --git a/metadata/md5-cache/dev-java/spring-aop-3.2.4 b/metadata/md5-cache/dev-java/spring-aop-3.2.4
index 114391f1771f..c3596066f3d9 100644
--- a/metadata/md5-cache/dev-java/spring-aop-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-aop-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 dev-java/spring-beans:3.2 dev-java/aopalliance:1 dev-java/aspectj:0 dev-java/commons-logging:0 dev-java/commons-pool:0 dev-java/jamon:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fcae0a87eaa2af3236bf17cf4f9a17b
diff --git a/metadata/md5-cache/dev-java/spring-beans-3.2.4 b/metadata/md5-cache/dev-java/spring-beans-3.2.4
index 5a210057b7e1..07761d51b776 100644
--- a/metadata/md5-cache/dev-java/spring-beans-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-beans-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/javax-inject:0 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b0fed8113df1f7dbf797f74c5af827a
diff --git a/metadata/md5-cache/dev-java/spring-core-3.2.4 b/metadata/md5-cache/dev-java/spring-core-3.2.4
index cf8e11164a94..d0bfed48307e 100644
--- a/metadata/md5-cache/dev-java/spring-core-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-core-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/commons-logging:0 dev-java/log4j:0 dev-java/aspectj:0 dev-java/asm:4 dev-java/cglib:3 dev-java/jopt-simple:4.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d2070d296fde4ac566f1ae802c87221
diff --git a/metadata/md5-cache/dev-java/spring-expression-3.2.4 b/metadata/md5-cache/dev-java/spring-expression-3.2.4
index c2a0149e522d..c632d2751156 100644
--- a/metadata/md5-cache/dev-java/spring-expression-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-expression-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 dev-java/spring-core:3.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f502aefaacd88d85cdd2311d557d465d
diff --git a/metadata/md5-cache/dev-java/spring-instrument-3.2.4 b/metadata/md5-cache/dev-java/spring-instrument-3.2.4
index 9249ba5e3033..44bcb915e0bd 100644
--- a/metadata/md5-cache/dev-java/spring-instrument-3.2.4
+++ b/metadata/md5-cache/dev-java/spring-instrument-3.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=https://github.com/SpringSource/spring-framework/archive/v3.2.4.RELEASE.tar.gz -> spring-framework-3.2.4.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-3.2.4-buildscripts.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fca57445c1e215019076a33820e67549
diff --git a/metadata/md5-cache/dev-java/spymemcached-2.9.1 b/metadata/md5-cache/dev-java/spymemcached-2.9.1
index 4b9e3636df1c..e934fcb429f6 100644
--- a/metadata/md5-cache/dev-java/spymemcached-2.9.1
+++ b/metadata/md5-cache/dev-java/spymemcached-2.9.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 spring? ( dev-java/spring-beans:3.2 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://spymemcached.googlecode.com/files/spymemcached-2.9.1-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=160b56929ace4a087b8ec4175af256dd
diff --git a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1 b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
index 8b5030e19f7a..9d9d16a22941 100644
--- a/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
+++ b/metadata/md5-cache/dev-java/squareness-jlf-2.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/squareness/squareness_jlf_src-2.3.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c12f76a460bbdaa2fa202bb320f4adc
diff --git a/metadata/md5-cache/dev-java/stax-1.2.0 b/metadata/md5-cache/dev-java/stax-1.2.0
index d797286cdf4d..5f83dec0db1d 100644
--- a/metadata/md5-cache/dev-java/stax-1.2.0
+++ b/metadata/md5-cache/dev-java/stax-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2aa5242d60065388a09e5c552cfc8e69
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.0-r4 b/metadata/md5-cache/dev-java/stax-ex-1.0-r4
index b35881c5ac20..68230770e44f 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.0-r4
+++ b/metadata/md5-cache/dev-java/stax-ex-1.0-r4
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 java-virtuals/jaf:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://stax-ex.java.net/files/documents/4480/44372/stax-ex-1.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db0ada23352c23e0b1e717d97ce9131b
diff --git a/metadata/md5-cache/dev-java/stax-ex-1.7.6 b/metadata/md5-cache/dev-java/stax-ex-1.7.6
index 6b6bdb0efe0d..1b7d73aabac2 100644
--- a/metadata/md5-cache/dev-java/stax-ex-1.7.6
+++ b/metadata/md5-cache/dev-java/stax-ex-1.7.6
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://maven.java.net/content/groups/public/org/jvnet/staxex/stax-ex/1.7.6/stax-ex-1.7.6-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2a6a7b78a9404a2161cfbb074494d66
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.0.0 b/metadata/md5-cache/dev-java/stax2-api-4.0.0
index 1fe509a08d6f..34345207f801 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.0.0
+++ b/metadata/md5-cache/dev-java/stax2-api-4.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=java-virtuals/stax-api:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6731f900c29d4828565f8d23eb60946c
diff --git a/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1 b/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
index 132747c80343..1dde2a5c3bc1 100644
--- a/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
+++ b/metadata/md5-cache/dev-java/stax2-api-4.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/FasterXML/stax2-api/archive/stax2-api-4.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=027e96fcad1fea5f16036ac75e7d6f2f
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
index 84d734a6fac7..b74141d5e368 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/antlr/stringtemplate3/archive/3.2.1.tar.gz -> stringtemplate-3.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2fc463cf45d7127b4206ce3bd2647369
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
index 0b5f3f2183b7..2ad430850ce3 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.0.8
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
@@ -10,5 +10,5 @@ PDEPEND=>=dev-java/antlr-3.5.2:3.5
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4
 SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=63a23f2301e88b9184a589c901aaaf80
diff --git a/metadata/md5-cache/dev-java/sun-dtdparser-1.0 b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
index a6dc9c862e56..13b9808c4264 100644
--- a/metadata/md5-cache/dev-java/sun-dtdparser-1.0
+++ b/metadata/md5-cache/dev-java/sun-dtdparser-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/dtd-parser-1.0-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab8dc3dd4e4dfe5db1d9eb1acb169609
diff --git a/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1 b/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1
index 13babc822be3..d128f990a9f9 100644
--- a/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1
+++ b/metadata/md5-cache/dev-java/sun-httpserver-bin-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=2
 SRC_URI=https://jax-ws.dev.java.net/jax-ws-201-m1/JAXWS2.0.1m1_source_20060817.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c53142dbfd9240bc010ede57c5af74b
diff --git a/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2 b/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
index 52090c56aa9c..4f832d6e55e7 100644
--- a/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
+++ b/metadata/md5-cache/dev-java/sun-j2ee-deployment-bin-1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=1.1
 SRC_URI=j2ee_deployment-1_1-fr-class.zip doc? ( j2ee_deployment-1_1-fr-doc.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b76b8562ca7598d156ca01d488ab41d
diff --git a/metadata/md5-cache/dev-java/sun-jacc-api-20070102 b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
index 4550227f2983..63f0909f2533 100644
--- a/metadata/md5-cache/dev-java/sun-jacc-api-20070102
+++ b/metadata/md5-cache/dev-java/sun-jacc-api-20070102
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 =dev-java/servletapi-2.4* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jacc-api-20070102.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4e7a58863223c22814974ac619eea7f
diff --git a/metadata/md5-cache/dev-java/sun-jaf-1.1.1 b/metadata/md5-cache/dev-java/sun-jaf-1.1.1
index 49fb8fa88b40..715746852313 100644
--- a/metadata/md5-cache/dev-java/sun-jaf-1.1.1
+++ b/metadata/md5-cache/dev-java/sun-jaf-1.1.1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/sun-jaf-1.1.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2d6019ebc768b509d98ade96c877a03d
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
index d085a1b27a2e..a91bf0559de5 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c347e6977e6f3c484c1e2800e08b7d7
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
index 93a8952c8e67..caecf327ffda 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=mirror
 SLOT=0
 SRC_URI=!amd64? ( http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz ) amd64? ( http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-amd64.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47c16bd5b376ab623a096e44a91ef6b0
diff --git a/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1 b/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
index cfeda7702a57..c7f1b4663edd 100644
--- a/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
+++ b/metadata/md5-cache/dev-java/sun-java3d-bin-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( java3d-1_3_2-linux-amd64.zip ) x86? ( java3d-1_3_2-linux-i586.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76e368e98b4efff43c92478802102207
diff --git a/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1 b/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
index 7522d49b6d3c..45128f01f019 100644
--- a/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
+++ b/metadata/md5-cache/dev-java/sun-java3d-bin-1.4.0_pre5-r1
@@ -9,5 +9,5 @@ LICENSE=sun-jrl sun-jdl
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=amd64? ( http://download.java.net/media/java3d/builds/stable/1_4_0-build5/java3d-1_4_0-build5-linux-amd64.zip ) x86? ( http://download.java.net/media/java3d/builds/stable/1_4_0-build5/java3d-1_4_0-build5-linux-i586.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4929950fd5d66b9062dc1f2d4d9cb9e7
diff --git a/metadata/md5-cache/dev-java/sun-javamail-1.4.3 b/metadata/md5-cache/dev-java/sun-javamail-1.4.3
index 044047a5595f..08491417abb0 100644
--- a/metadata/md5-cache/dev-java/sun-javamail-1.4.3
+++ b/metadata/md5-cache/dev-java/sun-javamail-1.4.3
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2 BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jaf >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://kenai.com/projects/javamail/downloads/download//javamail-1.4.3-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1751f73b2e843025e18ddd17ee33ba83
diff --git a/metadata/md5-cache/dev-java/sun-jimi-1.0-r3 b/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
index 83cf6213df76..f4ca092958bf 100644
--- a/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
+++ b/metadata/md5-cache/dev-java/sun-jimi-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jimi1_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3659f12919f24ae121afa7191cd4b14a
diff --git a/metadata/md5-cache/dev-java/sun-jms-1.1-r2 b/metadata/md5-cache/dev-java/sun-jms-1.1-r2
index 925b0b5e2335..c1e604683fa9 100644
--- a/metadata/md5-cache/dev-java/sun-jms-1.1-r2
+++ b/metadata/md5-cache/dev-java/sun-jms-1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jms-1_1-fr-apidocs.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce74481a9019ba34b10b8f9321a01a7a
diff --git a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3 b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
index 8bad1a631952..495bfcd23a87 100644
--- a/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
+++ b/metadata/md5-cache/dev-java/sun-jmx-1.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 RESTRICT=fetch
 SLOT=0
 SRC_URI=jmx-1_2_1-ri.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75575d49508a212befc48df6ec71329a
diff --git a/metadata/md5-cache/dev-java/super-csv-2.3.1 b/metadata/md5-cache/dev-java/super-csv-2.3.1
index 5f99af69c483..b6e004a7e59c 100644
--- a/metadata/md5-cache/dev-java/super-csv-2.3.1
+++ b/metadata/md5-cache/dev-java/super-csv-2.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/super-csv/super-csv/archive/v2.3.1.zip -> super-csv-2.3.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32b43285af7963c21b749c038d05a03c
diff --git a/metadata/md5-cache/dev-java/sux4j-2.0 b/metadata/md5-cache/dev-java/sux4j-2.0
index d65901e926bf..560c2bd33304 100644
--- a/metadata/md5-cache/dev-java/sux4j-2.0
+++ b/metadata/md5-cache/dev-java/sux4j-2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/fastutil:5.0 dev-java/commons-io:1 dev-java/colt:0 dev-java/dsiutils:0 dev-java/log4j:0 dev-java/commons-collections:0 dev-java/commons-configuration:0 dev-java/jsap:0 dev-java/commons-lang:2.1 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://sux.dsi.unimi.it/sux4j-2.0-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=843369347bdfad733801d6aa8de1667d
diff --git a/metadata/md5-cache/dev-java/svgsalamander-0.0-r2 b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
index b249b34f5313..210e9bb9944c 100644
--- a/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
+++ b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/ant-core:0 dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/svgsalamander-0.0.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6a9003313e7875ba4592d6bfccd31956
diff --git a/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1 b/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
index c76493c565fc..5ecdc0b129b8 100644
--- a/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
+++ b/metadata/md5-cache/dev-java/swarmcache-1.0_pre20050106-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-collections-3 >=dev-java/commons-lo
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://gentoo/swarmcache-1.0_pre20050106.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abbee118fd7a8a559e993d33fa6ee451
diff --git a/metadata/md5-cache/dev-java/swidgets-0.1.1-r1 b/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
index af128b6b26bf..8c2daf6c610b 100644
--- a/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
+++ b/metadata/md5-cache/dev-java/swidgets-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 dev-java/toolbar >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://swidgets.tigris.org/files/documents/1472/18566/swidgets-0.1.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d6807a2eb5f38398372d2b8610ebf338
diff --git a/metadata/md5-cache/dev-java/swing-layout-1.0.4 b/metadata/md5-cache/dev-java/swing-layout-1.0.4
index 9344715bd943..2d1e60b37c9a 100644
--- a/metadata/md5-cache/dev-java/swing-layout-1.0.4
+++ b/metadata/md5-cache/dev-java/swing-layout-1.0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=https://swing-layout.dev.java.net/files/documents/2752/144673/swing-layout-1.0.4-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46678f73521688ae4c80f5f330bd3ed5
diff --git a/metadata/md5-cache/dev-java/swing-worker-1.1 b/metadata/md5-cache/dev-java/swing-worker-1.1
index c2ddad008247..3e8f81d0c4fb 100644
--- a/metadata/md5-cache/dev-java/swing-worker-1.1
+++ b/metadata/md5-cache/dev-java/swing-worker-1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://swingworker.dev.java.net/files/documents/2810/51774/swing-worker-src-1.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31345c40027c9f0f2db3c696dbf3cb03
diff --git a/metadata/md5-cache/dev-java/swingx-1.6.4 b/metadata/md5-cache/dev-java/swingx-1.6.4
index 37e4ff7ff19f..a8d32ff25d18 100644
--- a/metadata/md5-cache/dev-java/swingx-1.6.4
+++ b/metadata/md5-cache/dev-java/swingx-1.6.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/metainf-services:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.6
 SRC_URI=https://java.net/projects/swingx/downloads/download/releases/swingx-all-1.6.4-sources.jar https://java.net/projects/swingx/downloads/download/releases/swingx-mavensupport-1.6.4-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26fdf53ff50721170c5904ec3b4321f0
diff --git a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4 b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
index 2f3bf5e0b941..641a3ffec296 100644
--- a/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
+++ b/metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/swingx:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://java.net/downloads/swingx/releases/swingx-beaninfo-1.6.4-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab42c80589e0b3f63d1ffe76897dbffb
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0 b/metadata/md5-cache/dev-java/swingx-ws-1.0
index 55b0bd27a1fa..8b29f92bb279 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-httpclient:3 dev-java/jdom:1.0 dev-java/json:0 dev-java/jtidy:0 dev-java/rome:0 dev-java/swingx:1.6 dev-java/swingx-beaninfo:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/org/swinglabs/swingx-ws/1.0/swingx-ws-1.0-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38aa23a5fe4de1eae77f3d93ff610c67
diff --git a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515 b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515
index 0c48cdecbc2b..31d42aa82e39 100644
--- a/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515
+++ b/metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-httpclient:3 dev-java/jdom:1.0 dev-java/json:0 dev-java/jtidy:0 dev-java/rome:0 dev-java/swing-layout:1 dev-java/swingx:1.6 dev-java/swingx-beaninfo:0 dev-java/xerces:2 dev-java/xml-commons-external:1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=bt747
 SRC_URI=mirror://sourceforge/bt747/Development/swingx-ws-2011_05_15-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0346a2f7fae4da55ce6b20d6ce574f99
diff --git a/metadata/md5-cache/dev-java/swt-3.5.2 b/metadata/md5-cache/dev-java/swt-3.5.2
index 3694c784b931..9a55ab8c9083 100644
--- a/metadata/md5-cache/dev-java/swt-3.5.2
+++ b/metadata/md5-cache/dev-java/swt-3.5.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.5
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-ppc.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.5.2-201002111343/swt-3.5.2-gtk-linux-x86_64.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c8890ad6c37f3352b42bc092019ed91
diff --git a/metadata/md5-cache/dev-java/swt-3.7.1 b/metadata/md5-cache/dev-java/swt-3.7.1
index 01a55a0763db..2a67aa83144b 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.1
+++ b/metadata/md5-cache/dev-java/swt-3.7.1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-x86.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.1-201109091335/swt-3.7.1-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0fd5258cfb73123ba4faed62bb478d5e
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2 b/metadata/md5-cache/dev-java/swt-3.7.2
index ec7bab40b38b..7aaad75cb182 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2
+++ b/metadata/md5-cache/dev-java/swt-3.7.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8e9106a166f8c10f9f7a4bff83c6ea6
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r1 b/metadata/md5-cache/dev-java/swt-3.7.2-r1
index 82ab29c30411..711771c3685c 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r1
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.7
 SRC_URI=x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a684ae71bd931079a89ce3852e3c265
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2 b/metadata/md5-cache/dev-java/swt-3.8.2
index 04932463a228..ecec65337cd7 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2
+++ b/metadata/md5-cache/dev-java/swt-3.8.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.8
 SRC_URI=x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91bab8457a26e5d68aa98c8fca5d3c6c
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r1 b/metadata/md5-cache/dev-java/swt-3.8.2-r1
index 95c208a2d400..bee6107e0413 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r1
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.2.0
 SLOT=3.8
 SRC_URI=x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e1ea081ab87577bf9d9706f812ff4237
diff --git a/metadata/md5-cache/dev-java/swt-4.2 b/metadata/md5-cache/dev-java/swt-4.2
index e3a1f307858e..98c9392f054c 100644
--- a/metadata/md5-cache/dev-java/swt-4.2
+++ b/metadata/md5-cache/dev-java/swt-4.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fe976236b3c2d737fa8b0906d7dd8fd
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r1 b/metadata/md5-cache/dev-java/swt-4.2-r1
index a26b956d06d5..bddbf407a10b 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r1
+++ b/metadata/md5-cache/dev-java/swt-4.2-r1
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b0dfcbf256379fa0f45d1a593174c37
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r2 b/metadata/md5-cache/dev-java/swt-4.2-r2
index bffbb4adc4b5..d2d2a913166c 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r2
+++ b/metadata/md5-cache/dev-java/swt-4.2-r2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
 RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=4.2
 SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b8ff4dd0db3498be737851d3c80b116
diff --git a/metadata/md5-cache/dev-java/tablelayout-1.0 b/metadata/md5-cache/dev-java/tablelayout-1.0
index 82fc4a4740da..6b796f27ccb1 100644
--- a/metadata/md5-cache/dev-java/tablelayout-1.0
+++ b/metadata/md5-cache/dev-java/tablelayout-1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.oracle.com/technetwork/java/tablelayout.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d60698d511f372f7a7693e511352134
diff --git a/metadata/md5-cache/dev-java/tagsoup-1.2.1 b/metadata/md5-cache/dev-java/tagsoup-1.2.1
index bdaa62feb904..f187cd71eb41 100644
--- a/metadata/md5-cache/dev-java/tagsoup-1.2.1
+++ b/metadata/md5-cache/dev-java/tagsoup-1.2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://mercury.ccil.org/~cowan/XML/tagsoup/tagsoup-1.2.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=619ddb376ad063b7ed15efc56d528e59
diff --git a/metadata/md5-cache/dev-java/tapestry-3.0.4-r2 b/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
index e5ca7e6edae2..4af103b8aa27 100644
--- a/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
+++ b/metadata/md5-cache/dev-java/tapestry-3.0.4-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:3.0 dev-java/servletapi:2.4 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tapestry/Tapestry-3.0.4-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=874ec71508afb9d466fc2c628893baac
diff --git a/metadata/md5-cache/dev-java/telnetd-2.0 b/metadata/md5-cache/dev-java/telnetd-2.0
index 35ba72bfcd96..870d63470e89 100644
--- a/metadata/md5-cache/dev-java/telnetd-2.0
+++ b/metadata/md5-cache/dev-java/telnetd-2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/telnetd/telnetd-2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d2b5b2aa1f89c84e85d40a9f3dca2e5
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
index a4af85bab918..a195dac4edd9 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10
+++ b/metadata/md5-cache/dev-java/testng-6.9.10
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b4f970189a31390564ff2edd870f204
diff --git a/metadata/md5-cache/dev-java/texhyphj-1.1 b/metadata/md5-cache/dev-java/texhyphj-1.1
index 74571ab4d719..bd1a5b3e5a6d 100644
--- a/metadata/md5-cache/dev-java/texhyphj-1.1
+++ b/metadata/md5-cache/dev-java/texhyphj-1.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.davidashen.net/TeXHyphenator-J/texhyphj-1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bca446f78d382d56c818bc1b5ee9b1aa
diff --git a/metadata/md5-cache/dev-java/tijmp-0.8 b/metadata/md5-cache/dev-java/tijmp-0.8
index 22cac4c0ef0c..991445867f48 100644
--- a/metadata/md5-cache/dev-java/tijmp-0.8
+++ b/metadata/md5-cache/dev-java/tijmp-0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.khelekore.org/jmp/tijmp/tijmp-0.8.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ba8db266288470cdaff33bca5c05540
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
index 77b0af357157..71da65dc71e0 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-compat-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/tomcat-jstl-spec:0 dev-java/tomcat-jstl-impl:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-compat-1.2.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=979af093c2b878620e88678b15c05719
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
index b36e228a5aab..52d5e56991a2 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-el-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-el-1.2.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7132e1c957bb23272ba1615a92f1fe9e
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
index 03768fe4a4b4..3fc014752225 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/xalan:0 dev-java/tomcat-jstl-spec:0 dev-java/tomcat-servlet-api:3.1 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-impl-1.2.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62322babe2b7ff15b5d080b0332ee9c4
diff --git a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1 b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
index b99157ffa8ca..53a79c94a5df 100644
--- a/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
+++ b/metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=java-virtuals/servlet-api:3.0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/taglibs-standard-1.2.5/taglibs-standard-1.2.5-source-release.zip -> tomcat-jstl-spec-1.2.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c57fe347dce9abaf7a0118438579f358
diff --git a/metadata/md5-cache/dev-java/tomcat-native-1.2.4 b/metadata/md5-cache/dev-java/tomcat-native-1.2.4
index dbdeb8240a32..62ff0bb5713c 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-1.2.4
+++ b/metadata/md5-cache/dev-java/tomcat-native-1.2.4
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1 dev-libs/openssl:= >=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/1.2.4/source/tomcat-native-1.2.4-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f475fb38cd35a906322591e437696d3
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
index e24dba67ba83..ea85a45cd3d4 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-3
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.2
 SRC_URI=mirror://apache/jakarta/tomcat-3/src/jakarta-servletapi-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee98c2c33b29665c3876707b0fc7b6de
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36 b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
index 8cff6cdcde1d..adc92dc17d90 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.36
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-4/v4.1.36/src/apache-tomcat-4.1.36-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b7fb10ac076b4b52269a907aa87eb07
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
index 10879b8bb57e..4bfd317bb423 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.27-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.27/src/apache-tomcat-5.5.27-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a516340efdce34ad4d886a2df409fd6e
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34 b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
index 95dbbfa3c08a..22a7db3d4236 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-5.5.34
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0
 SLOT=2.4
 SRC_URI=mirror://apache/tomcat/tomcat-5/v5.5.34/src/apache-tomcat-5.5.34-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-osgi	a6786ef95ac1c00fe7da4bb9dc1499f3	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=353c4bfafc81d6fd39fcfa4a9a5c014b
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
index 8ff793e2b56b..6537643e4365 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.44-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6edd400a57974d1116b91300b791af8
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45 b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
index 5ba698ed6c14..5086b1a3ded6 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.45
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.5
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c7ae6352bbbefe017e2ca3e312022c7
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
index 21993d649d95..c164ecb056a9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.59
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.59/src/apache-tomcat-7.0.59-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cde25acb95ff358786aa37d55f2be4e9
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.67 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.67
index fc3c92e3c035..b603413e8acc 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.67
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.67
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.67/src/apache-tomcat-7.0.67-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b48d3810308939c804044f30d1b0b776
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.68 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.68
index 0a8ab2057278..ba5c591176c9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.68
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.68
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.68/src/apache-tomcat-7.0.68-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f7ece82a9f85f19d4d2a1b2c2d71138
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.30 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.30
index d42802fd667e..ec05f440e528 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.30
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.30
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.30/src/apache-tomcat-8.0.30-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=502e982eb3e3fe6e1290fd746bdab5ec
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.32 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.32
index 00b93b0a45fd..ad845755b7d9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.32
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.32
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.32/src/apache-tomcat-8.0.32-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54eaf760f8acfcf323f68e68cf6036e1
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha3 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha3
index 130a66431ced..2c4bb13f432e 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha3
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.0_alpha3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.0.M3/src/apache-tomcat-9.0.0.M3-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b69075048c9527c1f22e985bc08b0207
diff --git a/metadata/md5-cache/dev-java/toolbar-1.1.0-r1 b/metadata/md5-cache/dev-java/toolbar-1.1.0-r1
index 2abfda00fd02..4f23eeac1c3e 100644
--- a/metadata/md5-cache/dev-java/toolbar-1.1.0-r1
+++ b/metadata/md5-cache/dev-java/toolbar-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://toolbar.tigris.org/files/documents/869/25285/toolbar-1.1.0-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac2c3022c2f9071e5a61b76600dc64c0
diff --git a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1 b/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1
index e4007d35a573..e47f116f3596 100644
--- a/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1
+++ b/metadata/md5-cache/dev-java/touchgraph-graphlayout-1.22-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/touchgraph/TGGL_122_jre11.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0ecc36b97cf2143f320c033291a5390
diff --git a/metadata/md5-cache/dev-java/treelayout-1.0.2 b/metadata/md5-cache/dev-java/treelayout-1.0.2
index 5076a4eac85f..0f7786eda25c 100644
--- a/metadata/md5-cache/dev-java/treelayout-1.0.2
+++ b/metadata/md5-cache/dev-java/treelayout-1.0.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/abego/treelayout/archive/v1.0.2.tar.gz -> treelayout-1.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba396250260cded411c9444947d51369
diff --git a/metadata/md5-cache/dev-java/trident-1.3 b/metadata/md5-cache/dev-java/trident-1.3
index b15167063b28..a94670961cbd 100644
--- a/metadata/md5-cache/dev-java/trident-1.3
+++ b/metadata/md5-cache/dev-java/trident-1.3
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/swt:3.7 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://kenai.com/projects/trident/downloads/download/version%201.3%20-%20stable/trident-all.zip -> trident-1.3.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c8ebdc0ce992b961db560119345e010
diff --git a/metadata/md5-cache/dev-java/trove-2.1.0 b/metadata/md5-cache/dev-java/trove-2.1.0
index 72f8aea2776c..e4f8297157d3 100644
--- a/metadata/md5-cache/dev-java/trove-2.1.0
+++ b/metadata/md5-cache/dev-java/trove-2.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/trove4j/trove-2.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1002c146361ecc34c5a23e8ff0a0e128
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2 b/metadata/md5-cache/dev-java/trove-3.0.2
index 23e6afef1df2..e2637a7f5e2b 100644
--- a/metadata/md5-cache/dev-java/trove-3.0.2
+++ b/metadata/md5-cache/dev-java/trove-3.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/trove4j/trove-3.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=01778a4b3152464bf227d24970382494
diff --git a/metadata/md5-cache/dev-java/trove-3.0.2-r1 b/metadata/md5-cache/dev-java/trove-3.0.2-r1
index a117f5d35ad9..d7e9d63a36fe 100644
--- a/metadata/md5-cache/dev-java/trove-3.0.2-r1
+++ b/metadata/md5-cache/dev-java/trove-3.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=mirror://sourceforge/trove4j/trove-3.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=895fcc3554e83815d05aacd82d768deb
diff --git a/metadata/md5-cache/dev-java/txw2-runtime-20110809 b/metadata/md5-cache/dev-java/txw2-runtime-20110809
index b39bd1715c2a..e6fce52ed61a 100644
--- a/metadata/md5-cache/dev-java/txw2-runtime-20110809
+++ b/metadata/md5-cache/dev-java/txw2-runtime-20110809
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/sun/xml/txw2/txw2/20110809/txw2-20110809-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=495a02ebd1d0695b24ac838949853201
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.2.1 b/metadata/md5-cache/dev-java/typesafe-config-1.2.1
index 873c7fd28b07..b5d89f0f2670 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.2.1
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/typesafehub/config/archive/v1.2.1.zip -> typesafe-config-1.2.1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=995485ee9c082ca88bcc3b2c82695076
diff --git a/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r2 b/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r2
index deed92429c42..b22bdbbf7a81 100644
--- a/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r2
+++ b/metadata/md5-cache/dev-java/typesafe-config-1.3.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/typesafehub/config/archive/v1.3.0.zip -> typesafe-config-1.3.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ffb37da0492af88312f9e2893e2567c
diff --git a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644 b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
index 9bae0897b3ae..96ad309d8877 100644
--- a/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
+++ b/metadata/md5-cache/dev-java/unkrig-nullanalysis-0_pre1644
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/unkrig-nullanalysis/unkrig-nullanalysis-0_pre1644.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c635702f4b207ad77d761f784ba73e09
diff --git a/metadata/md5-cache/dev-java/validation-api-1.1.0 b/metadata/md5-cache/dev-java/validation-api-1.1.0
index ec692c07baeb..bd28e603eac9 100644
--- a/metadata/md5-cache/dev-java/validation-api-1.1.0
+++ b/metadata/md5-cache/dev-java/validation-api-1.1.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.0
 SRC_URI=https://repo1.maven.org/maven2/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final-sources.jar -> validation-api-1.1.0.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e7663b475de468d748243232092bce6
diff --git a/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12 b/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
index a055894ea9b0..bae8196cb196 100644
--- a/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
+++ b/metadata/md5-cache/dev-java/vecmath-1.6.0_pre12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/hharrison/vecmath/archive/1.6.0-pre12.tar.gz -> vecmath-1.6.0_pre12.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d75c52b1d4ce9a1347c4fe13e665f42d
diff --git a/metadata/md5-cache/dev-java/velocity-1.7 b/metadata/md5-cache/dev-java/velocity-1.7
index ec43c716b94f..9ab809bef49f 100644
--- a/metadata/md5-cache/dev-java/velocity-1.7
+++ b/metadata/md5-cache/dev-java/velocity-1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-collections:0 dev-java/commons-lang:2.1 dev-java/common
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7daf67808e600abd2b36991d3bbb7844
diff --git a/metadata/md5-cache/dev-java/velocity-1.7-r1 b/metadata/md5-cache/dev-java/velocity-1.7-r1
index 0660b8ee0bc6..2d903a64c8af 100644
--- a/metadata/md5-cache/dev-java/velocity-1.7-r1
+++ b/metadata/md5-cache/dev-java/velocity-1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-collections:0 dev-java/commons-lang:2.1 dev-java/common
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a186e9ecf77f9502119093d622d30b81
diff --git a/metadata/md5-cache/dev-java/velocity-1.7-r2 b/metadata/md5-cache/dev-java/velocity-1.7-r2
new file mode 100644
index 000000000000..4568971a1cd8
--- /dev/null
+++ b/metadata/md5-cache/dev-java/velocity-1.7-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/werken-xpath:0 dev-java/jakarta-oro:2.0 dev-java/avalon-logkit:2.0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-collections:0 java-virtuals/servlet-api:2.3 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=Java framework for easy creation/rendering of documents
+EAPI=5
+HOMEPAGE=http://velocity.apache.org
+IUSE=test elibc_FreeBSD examples doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/werken-xpath:0 dev-java/jakarta-oro:2.0 dev-java/avalon-logkit:2.0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-collections:0 java-virtuals/servlet-api:2.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e58293ce156e06a7e24473195387d921
diff --git a/metadata/md5-cache/dev-java/velocity-dvsl-1.0 b/metadata/md5-cache/dev-java/velocity-dvsl-1.0
new file mode 100644
index 000000000000..3c968deb2176
--- /dev/null
+++ b/metadata/md5-cache/dev-java/velocity-dvsl-1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/velocity:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=Declarative Velocity Style Language.
+EAPI=5
+HOMEPAGE=http://velocity.apache.org/dvsl/devel/
+IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/velocity:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://apache/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip -> velocity-dvsl-1.0.zip
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=19d2489c69767f0a2d8f4a30cbb97f8f
diff --git a/metadata/md5-cache/dev-java/vldocking-3.0.5 b/metadata/md5-cache/dev-java/vldocking-3.0.5
index ee3c419ba8e4..8b8bab186b1f 100644
--- a/metadata/md5-cache/dev-java/vldocking-3.0.5
+++ b/metadata/md5-cache/dev-java/vldocking-3.0.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-java/slf4j-log4j12:0 dev-java/slf4j-api:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/cmadsen/vldocking/archive/vldocking-3.0.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91358952916f3f39d08d43d7967e2c48
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
index 5f4e627b6b68..b58eb778573a 100644
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
+++ b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
@@ -9,5 +9,5 @@ LICENSE=JDOM
 RDEPEND=>=virtual/jre-1.4 dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4298abd95828eca9155caef5e75a975e
diff --git a/metadata/md5-cache/dev-java/ws-commons-util-1.0.1 b/metadata/md5-cache/dev-java/ws-commons-util-1.0.1
index 196272f37fe5..f4e591b93531 100644
--- a/metadata/md5-cache/dev-java/ws-commons-util-1.0.1
+++ b/metadata/md5-cache/dev-java/ws-commons-util-1.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c94c13645d1fd206cb16cbd739bd59d
diff --git a/metadata/md5-cache/dev-java/ws-commons-util-1.0.1-r1 b/metadata/md5-cache/dev-java/ws-commons-util-1.0.1-r1
index 9662415c90f1..a4b631be6949 100644
--- a/metadata/md5-cache/dev-java/ws-commons-util-1.0.1-r1
+++ b/metadata/md5-cache/dev-java/ws-commons-util-1.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b7c9e2841a23cbb151d7dfd0d576a54
diff --git a/metadata/md5-cache/dev-java/wsdl4j-1.6.2 b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
index b44c6ca8b017..0c3f3ffb3854 100644
--- a/metadata/md5-cache/dev-java/wsdl4j-1.6.2
+++ b/metadata/md5-cache/dev-java/wsdl4j-1.6.2
@@ -9,5 +9,5 @@ LICENSE=CPL-1.0
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/wsdl4j/wsdl4j-src-1.6.2.zip test? ( mirror://sourceforge/jwsdltck/jwsdltck-bin-1.2.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6879479b335ffb82fa6f411f31e16efe
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.9-r1 b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
index 3f75145a5f49..b87c707a9372 100644
--- a/metadata/md5-cache/dev-java/wstx-3.2.9-r1
+++ b/metadata/md5-cache/dev-java/wstx-3.2.9-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/sax:0 dev-java/msv:0 dev-java/relaxng-datatype:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=mirror://gentoo/wstx-src-3.2.9.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee9daf0aec7757c47129da14fc749f9a
diff --git a/metadata/md5-cache/dev-java/xalan-2.7.2 b/metadata/md5-cache/dev-java/xalan-2.7.2
index caab49f28990..908604d31ad2 100644
--- a/metadata/md5-cache/dev-java/xalan-2.7.2
+++ b/metadata/md5-cache/dev-java/xalan-2.7.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/javacup:0 dev-java/bcel:0 >=virtual/jre-1.3 ~dev-java/xalan-serializer-2.7.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz doc? ( mirror://apache/xalan/xalan-j/binaries/xalan-j_2_7_2-bin.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1596a7d0d313c2d9caf5d8a6965de92
diff --git a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2 b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
index 6b2e571c80eb..c73ca1c73b7b 100644
--- a/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
+++ b/metadata/md5-cache/dev-java/xalan-serializer-2.7.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xalan/xalan-j/source/xalan-j_2_7_2-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=caf0f7d344c09a6103f9ea8d4f9029e6
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0 b/metadata/md5-cache/dev-java/xerces-2.11.0
index cf5e29a59763..6424238024b9 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73160460c8923f09c665e99746b8e26d
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0-r1 b/metadata/md5-cache/dev-java/xerces-2.11.0-r1
index 36ad513b26ce..1e5959eec8f4 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0-r1
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ec0150d82a407f9c5aa7603910a4fd2
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.0.1 b/metadata/md5-cache/dev-java/xerial-core-2.0.1
index 201653a67687..b267f13179f7 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.0.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ce87607f16174e2519956bd903ba6fe
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
index bbb04ca0fd12..848159551138 100644
--- a/metadata/md5-cache/dev-java/xjavac-20110814
+++ b/metadata/md5-cache/dev-java/xjavac-20110814
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://gentoo/xjavac-20110814.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be622052511a6be8f295e12db8487a1b
diff --git a/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1 b/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
index ca6d5dec9a17..f346a9c0042e 100644
--- a/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
+++ b/metadata/md5-cache/dev-java/xml-commons-1.0_beta2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1 public-domain W3C-document W3C
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xml/commons/xml-commons-1.0.b2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aac6d964d88e9abb9713396cacd55378
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04 b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
index 4a84ea33a8c2..abd472d682d0 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.3.04
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.3
 SRC_URI=mirror://gentoo/xml-commons-external-1.3.04.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=383c4edccdba315a9a3d3da329fca7fd
diff --git a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01 b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
index c7b72efba8d7..b7bb840c4842 100644
--- a/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
+++ b/metadata/md5-cache/dev-java/xml-commons-external-1.4.01
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1.4
 SRC_URI=https://dev.gentoo.org/~sera/distfiles/xml-commons-external-1.4.01.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=907dfc00c6cf730086a893837a23c6d4
diff --git a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2 b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
index fd1e0093bf4f..a4ed088df98a 100644
--- a/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
+++ b/metadata/md5-cache/dev-java/xml-commons-resolver-1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/xml/commons/xml-commons-resolver-1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=790a16798be79c7eae8897f15269e093
diff --git a/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1 b/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
index 1ebe6fc479cc..106024d889b2 100644
--- a/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
+++ b/metadata/md5-cache/dev-java/xml-im-exporter-1.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/xml-im-exporter/xml-im-exporter1.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60a64d44a6fbcc4b947039d18cfdd02d
diff --git a/metadata/md5-cache/dev-java/xml-security-1.5.7-r1 b/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
index 4ac58540d360..0ed0d637ae68 100644
--- a/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
+++ b/metadata/md5-cache/dev-java/xml-security-1.5.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 dev-java/xalan:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/santuario/java-library/1_5_7/xml-security-bin-1_5_7.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6043baad2aebfea12ca3790f6fd221b9
diff --git a/metadata/md5-cache/dev-java/xml-writer-0.2 b/metadata/md5-cache/dev-java/xml-writer-0.2
index 3169c75b4e6b..0435b2deb206 100644
--- a/metadata/md5-cache/dev-java/xml-writer-0.2
+++ b/metadata/md5-cache/dev-java/xml-writer-0.2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.megginson.com/downloads/xml-writer-0.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e2571c659e3d2fbaee58217ec3130f8
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1 b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
index d7bc8147e26d..9cdc86b44d04 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-1.0.4_pre20041217-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jaxen:1.1 dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://gentoo/xml-xmlbeans-20041217.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f117155e481a3e1ad0cc8c73920f237
diff --git a/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0 b/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
index b64a6531feae..a591abc7364c 100644
--- a/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
+++ b/metadata/md5-cache/dev-java/xml-xmlbeans-2.6.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/saxon:9 dev-java/jsr173:0 dev-java/annogen:0 dev-java/piccolo:0 dev-java/ant-core:0 dev-java/xml-commons-resolver:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=http://archive.apache.org/dist/xmlbeans/source/xmlbeans-2.6.0-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e72f1325212d2a00a098038588b604d6
diff --git a/metadata/md5-cache/dev-java/xmldb-20011111-r1 b/metadata/md5-cache/dev-java/xmldb-20011111-r1
index a307d70662db..5a9d6527ea50 100644
--- a/metadata/md5-cache/dev-java/xmldb-20011111-r1
+++ b/metadata/md5-cache/dev-java/xmldb-20011111-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/xalan-2.7 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/xmldb-org/xmldb-api-11112001.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=de5bd71e8d44b0bdad81e0eb4e887d42
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
index 7757e5ff7410..26be88fbdfc8 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.0.1-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38bcd99789c23611d43315024bb95735
diff --git a/metadata/md5-cache/dev-java/xmlrpc-3.1.3 b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
index 846a645f1d60..11ea0139b1e7 100644
--- a/metadata/md5-cache/dev-java/xmlrpc-3.1.3
+++ b/metadata/md5-cache/dev-java/xmlrpc-3.1.3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-httpclient:3 dev-java/commons-codec:0 dev-java/ws-commons-util:0 dev-java/commons-logging:0 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3
 SRC_URI=https://archive.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-3.1.3-src.tar.bz2 https://dev.gentoo.org/~ercpe/distfiles/dev-java/xmlrpc/xmlrpc-3.1.3-build.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85811cf60a8dc8b4e02131a9ee5d76e9
diff --git a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3 b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
index c58298ec3405..4d9a5c1624d9 100644
--- a/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
+++ b/metadata/md5-cache/dev-java/xmlstreambuffer-1.5.3
@@ -9,5 +9,5 @@ LICENSE=CDDL GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/stax-ex:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://maven.java.net/content/repositories/releases/com/sun/xml/stream/buffer/streambuffer/1.5.3/streambuffer-1.5.3-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b59b7a8ede9a3325c48be3b635ec310
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6 b/metadata/md5-cache/dev-java/xmlunit-1.6
index 815505e14877..678ffbb91343 100644
--- a/metadata/md5-cache/dev-java/xmlunit-1.6
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=1
 SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a6661a3308bbbacd4c9d566b755526b2
diff --git a/metadata/md5-cache/dev-java/xmpcore-5.1.2 b/metadata/md5-cache/dev-java/xmpcore-5.1.2
index da10f8b7dbce..40490b6cea75 100644
--- a/metadata/md5-cache/dev-java/xmpcore-5.1.2
+++ b/metadata/md5-cache/dev-java/xmpcore-5.1.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/adobe/xmp/xmpcore/5.1.2/xmpcore-5.1.2-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed2465cc2b8fe0115e88cf2f818b3626
diff --git a/metadata/md5-cache/dev-java/xom-1.2.10 b/metadata/md5-cache/dev-java/xom-1.2.10
index 7e35334c55c7..085ac89027d7 100644
--- a/metadata/md5-cache/dev-java/xom-1.2.10
+++ b/metadata/md5-cache/dev-java/xom-1.2.10
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/xerces:2 dev-java/xml-commons-external:1.3 ex
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cafeconleche.org/XOM/xom-1.2.10.tar.gz http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.6-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f25a3683ba5e79b0375c0677fe5cb8cf
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r2 b/metadata/md5-cache/dev-java/xp-0.5-r2
index d0e15b7201cb..ae4ee655c524 100644
--- a/metadata/md5-cache/dev-java/xp-0.5-r2
+++ b/metadata/md5-cache/dev-java/xp-0.5-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=ftp://ftp.jclark.com/pub/xml/xp.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b1b8d1a391beb3a2dec42060e94d025
diff --git a/metadata/md5-cache/dev-java/xp-0.5-r3 b/metadata/md5-cache/dev-java/xp-0.5-r3
index 713e5fe48da5..2e268a2be3ff 100644
--- a/metadata/md5-cache/dev-java/xp-0.5-r3
+++ b/metadata/md5-cache/dev-java/xp-0.5-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=ftp://ftp.jclark.com/pub/xml/xp.zip -> xp-0.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7bb325246e673a82bc02a3276f4b57c7
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r2 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
index 73295437b9ca..ec8edeb17a64 100644
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
+++ b/metadata/md5-cache/dev-java/xpp2-2.1.10-r2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.3 dev-java/xerces:2 >=dev-java/java-config-2.2.0 source?
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c9233ae8146b2f4fe5bdcaf5509e49a
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
index d9f69a916845..2619346963ce 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-1.1.4c_src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a12bb54a04d003d7e40f211286b30616
diff --git a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r2 b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r2
index 53ce56943293..be15afa79354 100644
--- a/metadata/md5-cache/dev-java/xpp3-1.1.4c-r2
+++ b/metadata/md5-cache/dev-java/xpp3-1.1.4c-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1 IBM JDOM LGPL-2.1+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-1.1.4c_src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5fcac688f0a4690316dfba6bace8234
diff --git a/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2 b/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2
index f5e326b06aaa..20cc871dff4c 100644
--- a/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2
+++ b/metadata/md5-cache/dev-java/xsd2jibx-0.2a_beta-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-logging:0 dev-java/xpp3:0 dev-java/jaxme:0 dev-java/jibx:0 dev-java/commons-lang:2.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jibx/xsd2jibx-beta2a.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a547e01f3a664dcfe2743f6f22e2cd0e
diff --git a/metadata/md5-cache/dev-java/xsdlib-20090415 b/metadata/md5-cache/dev-java/xsdlib-20090415
index 66d2420dca52..c1467f308118 100644
--- a/metadata/md5-cache/dev-java/xsdlib-20090415
+++ b/metadata/md5-cache/dev-java/xsdlib-20090415
@@ -9,5 +9,5 @@ LICENSE=BSD Apache-1.1
 RDEPEND=dev-java/xerces:2 dev-java/relaxng-datatype:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://java.net/downloads/msv/releases/xsdlib.20090415.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4bf3814fdb523e22a549feb3be99340
diff --git a/metadata/md5-cache/dev-java/xsom-20060901 b/metadata/md5-cache/dev-java/xsom-20060901
index 16b7c8ba4050..f9f8f67bd86c 100644
--- a/metadata/md5-cache/dev-java/xsom-20060901
+++ b/metadata/md5-cache/dev-java/xsom-20060901
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=>=virtual/jre-1.5 dev-java/relaxng-datatype dev-java/relaxngcc >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gentoo/xsom-src-20060901.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f10b128c33d390815481912b7b88c44f
diff --git a/metadata/md5-cache/dev-java/xstream-1.3.1-r4 b/metadata/md5-cache/dev-java/xstream-1.3.1-r4
index 95e5c91302d1..ff2956567a6a 100644
--- a/metadata/md5-cache/dev-java/xstream-1.3.1-r4
+++ b/metadata/md5-cache/dev-java/xstream-1.3.1-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/xom:0 dev-java/jdom:0 dev-java/xpp3:0 dev-java/cglib:3 dev-java
 RESTRICT=test
 SLOT=0
 SRC_URI=http://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream-distribution/1.3.1/xstream-distribution-1.3.1-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6ea20581ba6a41a89ece8ec77c12338
diff --git a/metadata/md5-cache/dev-java/xstream-1.4.8-r1 b/metadata/md5-cache/dev-java/xstream-1.4.8-r1
index ebe3317ca83c..28c04ae6bae8 100644
--- a/metadata/md5-cache/dev-java/xstream-1.4.8-r1
+++ b/metadata/md5-cache/dev-java/xstream-1.4.8-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/kxml:2 dev-java/xom:0 dev-java/xpp3:0 dev-java/cglib:3 dev-java/dom4j:1 dev-java/jdom:2 dev-java/jdom:1.0 dev-java/joda-time:0 dev-java/jettison:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://central.maven.org/maven2/com/thoughtworks/xstream/xstream/1.4.8/xstream-1.4.8-sources.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff11e3a1dd6c44e04e192f9ed08268c9
diff --git a/metadata/md5-cache/dev-java/xz-java-1.5 b/metadata/md5-cache/dev-java/xz-java-1.5
index 6ba9780afc8d..1cd7bf6abe38 100644
--- a/metadata/md5-cache/dev-java/xz-java-1.5
+++ b/metadata/md5-cache/dev-java/xz-java-1.5
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-java-1.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b67ec2934be0add8c0c50ec233b1b56
diff --git a/metadata/md5-cache/dev-java/yanfs-1.0 b/metadata/md5-cache/dev-java/yanfs-1.0
index d86a67bd31fc..2ecfa4b89153 100644
--- a/metadata/md5-cache/dev-java/yanfs-1.0
+++ b/metadata/md5-cache/dev-java/yanfs-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/yanfs/yanfs-1.0.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdc722d788b962fadeb010dfb1bad959
diff --git a/metadata/md5-cache/dev-java/zemberek-2.1.1 b/metadata/md5-cache/dev-java/zemberek-2.1.1
index 95b303e212c8..b10c017734e8 100644
--- a/metadata/md5-cache/dev-java/zemberek-2.1.1
+++ b/metadata/md5-cache/dev-java/zemberek-2.1.1
@@ -9,5 +9,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://zemberek.googlecode.com/files/zemberek-2.1.1-nolibs-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58a7835f444726d6873dd5b2a4473e51
diff --git a/metadata/md5-cache/dev-java/zeus-jscl-1.08 b/metadata/md5-cache/dev-java/zeus-jscl-1.08
index 32602eb7765a..ed0f6f0e6cc7 100644
--- a/metadata/md5-cache/dev-java/zeus-jscl-1.08
+++ b/metadata/md5-cache/dev-java/zeus-jscl-1.08
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/zeus-jscl/zeus-jscl_v1_08.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d023622bfca9fb9d26cd14e11eda764
diff --git a/metadata/md5-cache/dev-java/zeus-jscl-1.64 b/metadata/md5-cache/dev-java/zeus-jscl-1.64
index 7695a81a9a74..64065cb616fd 100644
--- a/metadata/md5-cache/dev-java/zeus-jscl-1.64
+++ b/metadata/md5-cache/dev-java/zeus-jscl-1.64
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/zeus-jscl/zeus-jscl_v1_64.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d146b4ab246d3c7bb2fabe46e36a86c
diff --git a/metadata/md5-cache/dev-lang/clojure-1.5.1 b/metadata/md5-cache/dev-lang/clojure-1.5.1
index baf375fc26c9..e99a961405c5 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.5.1
+++ b/metadata/md5-cache/dev-lang/clojure-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.5
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.5.1 -> clojure-1.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9eb019ff4016f4a0979218b0c36ce86
diff --git a/metadata/md5-cache/dev-lang/clojure-1.6.0 b/metadata/md5-cache/dev-lang/clojure-1.6.0
index fa824e0a3f64..6369e9d57ff8 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.6.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.6
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.6.0 -> clojure-1.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=192b55b1f25fcbd7cb9de51e04f9864c
diff --git a/metadata/md5-cache/dev-lang/clojure-1.7.0 b/metadata/md5-cache/dev-lang/clojure-1.7.0
index 5f0706f77828..d421a87f5c23 100644
--- a/metadata/md5-cache/dev-lang/clojure-1.7.0
+++ b/metadata/md5-cache/dev-lang/clojure-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.7
 SRC_URI=https://github.com/clojure/clojure/tarball/clojure-1.7.0 -> clojure-1.7.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1198628adca02d0e20c78aaab44e683
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
index 35e0dfd6ce52..6aa1df80d207 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20120305
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://closure-compiler.googlecode.com/files/compiler-20120305.tar.gz -> closure-compiler-bin-20120305.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3934a49161f3418bc3a458c017108c6f
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20121212 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20121212
index c362869b1a43..26e1bd882852 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20121212
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20121212
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://closure-compiler.googlecode.com/files/compiler-20121212.tar.gz -> closure-compiler-bin-20121212.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9646bafdeaecafde1590d3a37e8ac14a
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20130227 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20130227
index 8e0c776846fd..00558cab55ae 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20130227
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20130227
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://closure-compiler.googlecode.com/files/compiler-20130227.tar.gz -> closure-compiler-bin-20130227.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9646bafdeaecafde1590d3a37e8ac14a
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20130411 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20130411
index ee720fd013fe..ecf8617e2c19 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20130411
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20130411
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://closure-compiler.googlecode.com/files/compiler-20130411.tar.gz -> closure-compiler-bin-20130411.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9646bafdeaecafde1590d3a37e8ac14a
diff --git a/metadata/md5-cache/dev-lang/closure-compiler-bin-20150126 b/metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
index 6f22e2c15f87..b73ba10bb718 100644
--- a/metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
+++ b/metadata/md5-cache/dev-lang/closure-compiler-bin-20150126
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dl.google.com/closure-compiler/compiler-20150126.tar.gz -> closure-compiler-bin-20150126.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b17ea549aca568a19362967e9c84c6d7
diff --git a/metadata/md5-cache/dev-lang/erlang-15.2.3.1 b/metadata/md5-cache/dev-lang/erlang-15.2.3.1
index 048e5d08c0d0..4fac649c03dc 100644
--- a/metadata/md5-cache/dev-lang/erlang-15.2.3.1
+++ b/metadata/md5-cache/dev-lang/erlang-15.2.3.1
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_R15B03-1.tar.gz http://erlang.org/download/otp_doc_man_R15B03-1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R15B03-1.tar.gz )
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=7976d4199c3029be2119b9513dd37eab
diff --git a/metadata/md5-cache/dev-lang/erlang-17.5 b/metadata/md5-cache/dev-lang/erlang-17.5
index cf5aa8110acc..afb4f0234626 100644
--- a/metadata/md5-cache/dev-lang/erlang-17.5
+++ b/metadata/md5-cache/dev-lang/erlang-17.5
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_17.5.tar.gz http://erlang.org/download/otp_doc_man_17.5.tar.gz doc? ( http://erlang.org/download/otp_doc_html_17.5.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=5757ca9e612477233ae32d4da875d31c
diff --git a/metadata/md5-cache/dev-lang/erlang-18.0-r2 b/metadata/md5-cache/dev-lang/erlang-18.0-r2
index 66e8405ef0cf..df0b6d30abd9 100644
--- a/metadata/md5-cache/dev-lang/erlang-18.0-r2
+++ b/metadata/md5-cache/dev-lang/erlang-18.0-r2
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_18.0.tar.gz http://erlang.org/download/otp_doc_man_18.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_18.0.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=139dfe600dbaa419ed946f2edfa66233
diff --git a/metadata/md5-cache/dev-lang/erlang-18.2.1 b/metadata/md5-cache/dev-lang/erlang-18.2.1
index 050cc8c66e29..3b5597eabdba 100644
--- a/metadata/md5-cache/dev-lang/erlang-18.2.1
+++ b/metadata/md5-cache/dev-lang/erlang-18.2.1
@@ -9,5 +9,5 @@ LICENSE=ErlPL-1.1
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.erlang.org/download/otp_src_18.2.1.tar.gz http://erlang.org/download/otp_doc_man_18.2.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_18.2.1.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=4d26f6bc62dbd77b117ba9b2ce09a775
diff --git a/metadata/md5-cache/dev-lang/go-1.5.3 b/metadata/md5-cache/dev-lang/go-1.5.3
index 5e22091f2af5..c317efb8b77e 100644
--- a/metadata/md5-cache/dev-lang/go-1.5.3
+++ b/metadata/md5-cache/dev-lang/go-1.5.3
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/go-bootstrap-1.4.1
 DESCRIPTION=A concurrent garbage collected and typesafe programming language
 EAPI=5
 HOMEPAGE=http://www.golang.org
-KEYWORDS=-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=!<dev-go/go-tools-0_pre20150902
 SLOT=0/1.5.3
 SRC_URI=https://storage.googleapis.com/golang/go1.5.3.src.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d7625810d8f6bb8d2fb1e5110eb7fe8a
+_md5_=a53dd614bcdcf1366f717b6f3fe8b426
diff --git a/metadata/md5-cache/dev-lang/go-bootstrap-1.4.3 b/metadata/md5-cache/dev-lang/go-bootstrap-1.4.3
index 0f849dcf87c7..a6d251f64c06 100644
--- a/metadata/md5-cache/dev-lang/go-bootstrap-1.4.3
+++ b/metadata/md5-cache/dev-lang/go-bootstrap-1.4.3
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst prepare test
 DESCRIPTION=Version of go compiler used for bootstrapping
 EAPI=5
 HOMEPAGE=http://www.golang.org
-KEYWORDS=-* amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=-* amd64 arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://storage.googleapis.com/golang/go1.4.3.src.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=429001a642c190b9913f835f88d2b820
+_md5_=2e6cb9a0ffa39500109070cd783c67c8
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index a37fd0e249a4..b147c715dfbd 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=virtual/jdk-1.4 =dev-java/junit-3.8* || ( dev-lang/xsb dev-lang/swi-prolog dev-lang/yap ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.declarativa.com/interprolog/interprolog212.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a94fb87a69fc2774d0ce70cb48b0154d
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.6.0 b/metadata/md5-cache/dev-lang/lazarus-1.6.0
new file mode 100644
index 000000000000..ca61b9675eb9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lazarus-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lang/fpc-2.6.4[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
+DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
+EAPI=5
+HOMEPAGE=http://www.lazarus.freepascal.org/
+IUSE=minimal
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/fpc-2.6.4[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:= !=gnome-base/librsvg-2.16.1
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.6/lazarus-1.6.0-0.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=17d29291c5c72d8ad14f7aa343242c0a
diff --git a/metadata/md5-cache/dev-lang/mercury-11.01 b/metadata/md5-cache/dev-lang/mercury-11.01
index f6addb985ccd..32d574393862 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.01
+++ b/metadata/md5-cache/dev-lang/mercury-11.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.01.tar.gz mirror://gentoo/mercury-11.01-gentoo-patchset-1.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.01.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=334bf013e873b9b5c25bddf9e32fd9bf
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07 b/metadata/md5-cache/dev-lang/mercury-11.07
index 7fb83dec539a..bec0ced7c41f 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07
+++ b/metadata/md5-cache/dev-lang/mercury-11.07
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.tar.gz mirror://gentoo/mercury-11.07-gentoo-patchset-0.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe8e89362c1f0bade23a3db447d42d86
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07.1 b/metadata/md5-cache/dev-lang/mercury-11.07.1
index 1d4ddbd2891c..0d9dd167eca5 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07.1
+++ b/metadata/md5-cache/dev-lang/mercury-11.07.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.1.tar.gz mirror://gentoo/mercury-11.07.1-gentoo-patchset-4.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.1.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6b4f8453d34fed3d0bc1c5467c91a75
diff --git a/metadata/md5-cache/dev-lang/mercury-11.07.2 b/metadata/md5-cache/dev-lang/mercury-11.07.2
index 2f39e390dd0d..953d064e456e 100644
--- a/metadata/md5-cache/dev-lang/mercury-11.07.2
+++ b/metadata/md5-cache/dev-lang/mercury-11.07.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-compiler-11.07.2.tar.gz mirror://gentoo/mercury-11.07.2-gentoo-patchset-0.tar.gz test? ( mirror://gentoo/mercury-tests-11.07.2.tar.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=596e4e058c0e513061a08ddd782f9f2e
diff --git a/metadata/md5-cache/dev-lang/mercury-13.05 b/metadata/md5-cache/dev-lang/mercury-13.05
index 7874d6384282..7b29af057b22 100644
--- a/metadata/md5-cache/dev-lang/mercury-13.05
+++ b/metadata/md5-cache/dev-lang/mercury-13.05
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.tar.gz mirror://gentoo/mercury-13.05-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2cc508ff7c579680e653a579db05fe0
diff --git a/metadata/md5-cache/dev-lang/mercury-13.05.1 b/metadata/md5-cache/dev-lang/mercury-13.05.1
index 00913151835f..260c2aa0eef3 100644
--- a/metadata/md5-cache/dev-lang/mercury-13.05.1
+++ b/metadata/md5-cache/dev-lang/mercury-13.05.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.1.tar.gz mirror://gentoo/mercury-13.05.1-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=51d21be742a2eb61af84c08ec9442686
diff --git a/metadata/md5-cache/dev-lang/mercury-13.05.2 b/metadata/md5-cache/dev-lang/mercury-13.05.2
index 4cca7d7f8ef3..fa42f20ccac4 100644
--- a/metadata/md5-cache/dev-lang/mercury-13.05.2
+++ b/metadata/md5-cache/dev-lang/mercury-13.05.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.2.tar.gz mirror://gentoo/mercury-13.05.2-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=51d21be742a2eb61af84c08ec9442686
diff --git a/metadata/md5-cache/dev-lang/moarvm-2016.02 b/metadata/md5-cache/dev-lang/moarvm-2016.02
new file mode 100644
index 000000000000..d1f5e5e59401
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/moarvm-2016.02
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libuv dev-lang/perl
+DESCRIPTION=A 6model-based VM for NQP and Rakudo Perl 6
+EAPI=5
+HOMEPAGE=http://moarvm.org
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-libs/libuv
+SLOT=0
+SRC_URI=http://moarvm.org/releases/MoarVM-2016.02.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=4dc2eb41b59d49faa2c359d1f0366237
diff --git a/metadata/md5-cache/dev-lang/nqp-2016.02 b/metadata/md5-cache/dev-lang/nqp-2016.02
new file mode 100644
index 000000000000..51829633a8ee
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2016.02
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=java? ( >=virtual/jre-1.7 ) moar? ( ~dev-lang/moarvm-2016.02 ) dev-libs/libffi java? ( >=virtual/jdk-1.7 ) dev-lang/perl
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=5
+HOMEPAGE=http://rakudo.org/
+IUSE=doc java +moar
+KEYWORDS=~x86 ~amd64
+LICENSE=Artistic-2
+RDEPEND=java? ( >=virtual/jre-1.7 ) moar? ( ~dev-lang/moarvm-2016.02 ) dev-libs/libffi
+REQUIRED_USE=|| ( java moar )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/perl6/nqp/tarball/2016.02 -> nqp-2016.02.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9d7d53070bacb5833cce85d5d0a12044
diff --git a/metadata/md5-cache/dev-lang/rakudo-2016.02 b/metadata/md5-cache/dev-lang/rakudo-2016.02
new file mode 100644
index 000000000000..51400fdab9a8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rakudo-2016.02
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure test
+DEPEND==dev-lang/nqp-2016.02:=[moar] >=dev-lang/perl-5.10
+DESCRIPTION=A compiler for the Perl 6 programming language
+EAPI=6
+HOMEPAGE=http://rakudo.org
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND==dev-lang/nqp-2016.02:=[moar]
+SLOT=0
+SRC_URI=http://rakudo.org/downloads/rakudo/rakudo-2016.02.tar.gz
+_md5_=aabb08ddd2e0639f8e218ba3d734a7d8
diff --git a/metadata/md5-cache/dev-lang/scala-2.10.2-r3 b/metadata/md5-cache/dev-lang/scala-2.10.2-r3
index 78fcfb812709..cf16c35948fd 100644
--- a/metadata/md5-cache/dev-lang/scala-2.10.2-r3
+++ b/metadata/md5-cache/dev-lang/scala-2.10.2-r3
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/bndlib:0 dev-java/hawtjni-runtime:0 dev-java/junit:4 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.10/2.10.2
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.10.2.tar.gz -> scala-2.10.2.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.10.2-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~tomwij/files/dist/scala-2.10.2-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e16baa438e0d22db25c5d1844bb2503
diff --git a/metadata/md5-cache/dev-lang/scala-2.10.3-r2 b/metadata/md5-cache/dev-lang/scala-2.10.3-r2
index 0773c503b2c9..9ef50d8dbf1c 100644
--- a/metadata/md5-cache/dev-lang/scala-2.10.3-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.10.3-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.10/2.10.3
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.10.3.tar.gz -> scala-2.10.3.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8b6ba65c8146217333f0762087fe2340d572e832/docs/examples/plugintemplate/lib/scalatest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.10.3-maven-deps.tar.gz https://dev.gentoo.org/~gienah/snapshots/scala-2.10.3-maven-deps-2.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.10.3-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=695385f0c392a1e8e46d75321bb7122b
diff --git a/metadata/md5-cache/dev-lang/scala-2.10.4-r2 b/metadata/md5-cache/dev-lang/scala-2.10.4-r2
index e562bc51cc39..e2c817eda784 100644
--- a/metadata/md5-cache/dev-lang/scala-2.10.4-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.10.4-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.10/2.10.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.10.4.tar.gz -> scala-2.10.4.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.10.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.10.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.10.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.10.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.10.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar -> scala-2.10.4-fjbg.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.10.4-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar -> scala-2.10.4-jline.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar -> scala-2.10.4-msil.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar -> scala-2.10.4-scala-compiler-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar -> scala-2.10.4-scala-compiler.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar -> scala-2.10.4-scala-library-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar -> scala-2.10.4-scala-library.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar -> scala-2.10.4-scala-reflect-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar -> scala-2.10.4-scala-reflect.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.10.4-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.10.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.10.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.10.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.10.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.10.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.10.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar -> scala-2.10.4-scalacheck.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.10.4-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar -> scala-2.10.4-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.10.4-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.10.4-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.10.4-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=397c3ffee6e3eaa113513dc120637d99
diff --git a/metadata/md5-cache/dev-lang/scala-2.10.6 b/metadata/md5-cache/dev-lang/scala-2.10.6
index 9b1c2ef33fe1..ffd99d936a3f 100644
--- a/metadata/md5-cache/dev-lang/scala-2.10.6
+++ b/metadata/md5-cache/dev-lang/scala-2.10.6
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.10/2.10.6
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.10.6.tar.gz -> scala-2.10.6.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.10.6-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.10.6-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.10.6-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar -> scala-2.10.6-scala-library.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar -> scala-2.10.6-scala-reflect.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar -> scala-2.10.6-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.10.6-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.10.6-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.10.6-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.10.6-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar -> scala-2.10.6-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar -> scala-2.10.6-fjbg.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar -> scala-2.10.6-scala-library-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar -> scala-2.10.6-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.10.6-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.10.6-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.10.6-push.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar -> scala-2.10.6-jline.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar -> scala-2.10.6-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.10.6-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar -> scala-2.10.6-scalacheck.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.10.6-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.10.6-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar -> scala-2.10.6-scala-compiler-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar -> scala-2.10.6-scala-reflect-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar -> scala-2.10.6-msil.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar -> scala-2.10.6-scala-compiler.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar -> scala-2.10.6-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.10.6-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.10.6-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar -> scala-2.10.6-plugins.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.10.6-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.10.6-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31cbe247505b72b24720efde10940edb
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.1-r2 b/metadata/md5-cache/dev-lang/scala-2.11.1-r2
index efa74502d987..8af460bcbb21 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.1-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.11.1-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.1
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.1.tar.gz -> scala-2.11.1.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.1-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.1-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.1-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.1-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.1-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.1-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.1-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.1-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.1-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.1-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.1-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.1-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.1-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.1-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.1-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.1-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.1-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.1-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.1-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4c9647274ecd4e177163e5de9f8d261
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.2-r2 b/metadata/md5-cache/dev-lang/scala-2.11.2-r2
index 53f4edea990c..ee7d6741a089 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.2-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.11.2-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.2
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.2.tar.gz -> scala-2.11.2.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.2-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.2-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.2-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.2-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.2-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.2-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.2-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.2-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.2-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.2-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.2-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.2-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.2-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.2-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.2-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.2-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.2-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.2-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.2-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=115667374b48caff11e7c2eb1142d95a
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.4-r1 b/metadata/md5-cache/dev-lang/scala-2.11.4-r1
index d15bc8fdaaa1..76454d4aa065 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.4-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.4-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.6 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.4.tar.gz -> scala-2.11.4.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.4-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.4-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.4-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.4-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.4-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.4-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ff50779e25ea23f90aa92a811d7b58c
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.4-r2 b/metadata/md5-cache/dev-lang/scala-2.11.4-r2
index 14965b065ae6..79eb0da185ff 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.4-r2
+++ b/metadata/md5-cache/dev-lang/scala-2.11.4-r2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.4
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.4.tar.gz -> scala-2.11.4.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.4-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.4-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.4-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.4-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.4-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.4-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.4-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.4-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.4-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.4-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.4-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.4-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.4-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.4-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.4-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.4-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.4-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.4-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.4-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7399a4147209dd289e5b6fdbb74f3e9
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.6-r1 b/metadata/md5-cache/dev-lang/scala-2.11.6-r1
index 896743b27280..746328a302ec 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.6-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.6-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.6
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.6.tar.gz -> scala-2.11.6.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.6-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.6-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.6-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.6-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.6-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.6-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.6-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.6-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.6-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.6-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.6-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.6-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.6-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.6-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.6-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.6-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.6-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.6-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.6-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c50204503a87c1fef5d787494afb0967
diff --git a/metadata/md5-cache/dev-lang/scala-2.11.7-r1 b/metadata/md5-cache/dev-lang/scala-2.11.7-r1
index 445f17fd6e40..b9040ef56ce7 100644
--- a/metadata/md5-cache/dev-lang/scala-2.11.7-r1
+++ b/metadata/md5-cache/dev-lang/scala-2.11.7-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.11/2.11.7
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.11.7.tar.gz -> scala-2.11.7.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.11.7-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.11.7-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.11.7-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.11.7-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.11.7-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> scala-2.11.7-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.11.7-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> scala-2.11.7-code.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.11.7-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.11.7-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.11.7-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> scala-2.11.7-jsoup-1.3.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> scala-2.11.7-macro210.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.11.7-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.11.7-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> scala-2.11.7-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.11.7-push.jar https://dev.gentoo.org/~gienah/snapshots/scala-2.11.7-maven-deps.tar.gz ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.11.7-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ebabf97dc48842e80026ecbacf5c709e
diff --git a/metadata/md5-cache/dev-lang/scala-2.9.3 b/metadata/md5-cache/dev-lang/scala-2.9.3
index 829d68ef3f94..6deb5ec83bf7 100644
--- a/metadata/md5-cache/dev-lang/scala-2.9.3
+++ b/metadata/md5-cache/dev-lang/scala-2.9.3
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/scala-mode:0 )
 RDEPEND=dev-java/ant-core:0 dev-java/hawtjni-runtime:0 >=virtual/jre-1.7 app-eselect/eselect-scala !dev-lang/scala-bin:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=2.9/2.9.3
 SRC_URI=!binary? ( https://github.com/scala/scala/archive/v2.9.3.tar.gz -> scala-2.9.3.tar.gz http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8b6ba65c8146217333f0762087fe2340d572e832/docs/examples/plugintemplate/lib/scalatest.jar -> scala-2.9.3-scalatest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> scala-2.9.3-ant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> scala-2.9.3-ant-dotnet-1.0.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> scala-2.9.3-ant-contrib.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> scala-2.9.3-maven-ant-tasks-2.1.1.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> scala-2.9.3-vizant.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/12c479a33ee283599fdb7aa91d6a1df0197a52cf/lib/forkjoin.jar -> scala-2.9.3-forkjoin.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/bd8e22a955eeb82671c5fdb8a7a14bc7f25e9eb1/lib/fjbg.jar -> scala-2.9.3-fjbg.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/545b37930819a1196705e582a232abfeb252cc8d/lib/jline.jar -> scala-2.9.3-jline.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/6597e6f74113e952a4233c451c973f5ac7f2b705/lib/midpapi10.jar -> scala-2.9.3-midpapi10.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/58f64cd00399c724e7d526e5bdcbce3e2b79f78b/lib/msil.jar -> scala-2.9.3-msil.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/5f31fab985a3efc21229297810c625b0a2593757/lib/scala-compiler.jar -> scala-2.9.3-scala-compiler.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/c52dbed261e4870a504cef24518484b335a38067/lib/scala-library.jar -> scala-2.9.3-scala-library.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/364c3b992bdebeac9fafb187e1acbece45644de7/lib/scala-library-src.jar -> scala-2.9.3-scala-library-src.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> scala-2.9.3-jsr166_and_extra.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> scala-2.9.3-annotations.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> scala-2.9.3-enums.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> scala-2.9.3-genericNest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> scala-2.9.3-methvsfield.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> scala-2.9.3-nest.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/77dca656258fe983ec64461860ab1ca0f7e2fd65/test/files/lib/scalacheck.jar -> scala-2.9.3-scalacheck.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2546f965f6718b000c4e6ef73559c11084177bd8/test/files/speclib/instrumented.jar -> scala-2.9.3-instrumented.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar -> scala-2.9.3-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar -> scala-2.9.3-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar -> scala-2.9.3-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar -> scala-2.9.3-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar -> scala-2.9.3-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar -> scala-2.9.3-plugins.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/ee000286d00c5209d5644462c1cfea87fc8b1342/test/pending/pos/t1380/gnujaxp.jar -> scala-2.9.3-gnujaxp.jar http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> scala-2.9.3-push.jar ) binary? ( https://dev.gentoo.org/~gienah/files/dist/scala-2.9.3-gentoo-binary.tar.bz2 )
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=51b4c60658e751657576daba6414f85e
diff --git a/metadata/md5-cache/dev-lang/scala-bin-2.11.7 b/metadata/md5-cache/dev-lang/scala-bin-2.11.7
index 78003fe60b31..8e521f34af49 100644
--- a/metadata/md5-cache/dev-lang/scala-bin-2.11.7
+++ b/metadata/md5-cache/dev-lang/scala-bin-2.11.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 !dev-lang/scala >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://downloads.typesafe.com/scala/2.11.7/scala-2.11.7.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b73fc0c045744f1c7a6ec64619d20595
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.6.6 b/metadata/md5-cache/dev-lang/swi-prolog-6.6.6
index ef32b71c95ba..24c78363964f 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-6.6.6
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.6.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.6.6.tar.gz mirror://gentoo/swi-prolog-6.6.6-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0bf155bc1bcbc54a3a28a09b15e1ad39
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.2.3-r1 b/metadata/md5-cache/dev-lang/swi-prolog-7.2.3-r1
index 53167c8c449b..034a41796467 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.2.3-r1
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.2.3.tar.gz mirror://gentoo/swi-prolog-7.2.3-gentoo-patchset-1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c1e1413bd5cfa289c3de84199a6e9ad
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.3.16 b/metadata/md5-cache/dev-lang/swi-prolog-7.3.16
index c443faaeff21..3cc1368b8f95 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.3.16
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.3.16
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2.1
 RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.16.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bedeebb6c35cddbd88f92a2d7cfb4e4c
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.3.17 b/metadata/md5-cache/dev-lang/swi-prolog-7.3.17
index c73a8de254cd..6ec4b318d874 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.3.17
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.3.17
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2.1
 RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.17.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bedeebb6c35cddbd88f92a2d7cfb4e4c
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5 b/metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5
index b3ffaca9ebd2..aa2c23f6620c 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.4.0_rc5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jdk-1.5 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/tuprolog/2p-2.4.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=748625a1272cdb609c0f111d66295959
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.7.2 b/metadata/md5-cache/dev-lang/tuprolog-2.7.2
index 40e587073b28..208fced9deaa 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.7.2
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.7.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.7.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ae23b79f0175e495d765ab4ff73f358
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.9.0 b/metadata/md5-cache/dev-lang/tuprolog-2.9.0
index 97925fbc8398..22343b18e131 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.9.0
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.9.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7 >=dev-java/javassist-3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.9.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=070c8992ae6be79936bd7429f3423820
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.9.2 b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
index ddc8eb21472e..5626c727bffe 100644
--- a/metadata/md5-cache/dev-lang/tuprolog-2.9.2
+++ b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jdk-1.7:= dev-java/javassist:3 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/tuprolog-2.9.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=10cd63d22c141f6b086b2f0c47026ce1
diff --git a/metadata/md5-cache/dev-lang/vala-0.30.1 b/metadata/md5-cache/dev-lang/vala-0.30.1
index 236875b8aedd..e2700e2db193 100644
--- a/metadata/md5-cache/dev-lang/vala-0.30.1
+++ b/metadata/md5-cache/dev-lang/vala-0.30.1
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.24:2 >=dev-libs/vala-common-0.30.1
 SLOT=0.30
 SRC_URI=mirror://gnome/sources/vala/0.30/vala-0.30.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=081be85b3445ebb1b02d03579e139291
+_md5_=692414fed625fd140738a1f84464c708
diff --git a/metadata/md5-cache/dev-lang/xsb-3.3.6 b/metadata/md5-cache/dev-lang/xsb-3.3.6
index 974573125735..b1b49cf31b9a 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.3.6
+++ b/metadata/md5-cache/dev-lang/xsb-3.3.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB336.tar.gz mirror://gentoo/xsb-3.3.6-gentoo-patchset-1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e470357f9bd2422a0dd145e2ae6fede
diff --git a/metadata/md5-cache/dev-lang/xsb-3.3.7 b/metadata/md5-cache/dev-lang/xsb-3.3.7
index b5617dd627c6..6a73fc12be63 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.3.7
+++ b/metadata/md5-cache/dev-lang/xsb-3.3.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB337.tar.gz mirror://gentoo/xsb-3.3.7-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96c1192af3af1a1705944903cf92b967
diff --git a/metadata/md5-cache/dev-lang/xsb-3.5.0 b/metadata/md5-cache/dev-lang/xsb-3.5.0
index be8006d7eddc..022062b3f820 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.5.0
+++ b/metadata/md5-cache/dev-lang/xsb-3.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB350.tar.gz mirror://gentoo/xsb-3.5.0-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd7cfa31ea737d855625499fc4d098f5
diff --git a/metadata/md5-cache/dev-lang/xsb-3.6.0 b/metadata/md5-cache/dev-lang/xsb-3.6.0
index dcf7ebf29057..4ad227a2c3cd 100644
--- a/metadata/md5-cache/dev-lang/xsb-3.6.0
+++ b/metadata/md5-cache/dev-lang/xsb-3.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://xsb.sourceforge.net/downloads/XSB360.tar.gz mirror://gentoo/xsb-3.6.0-gentoo-patchset-2.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4f3b10dc06f31478b418065286e6fb2
diff --git a/metadata/md5-cache/dev-lang/yap-6.2.2 b/metadata/md5-cache/dev-lang/yap-6.2.2
index 77ff4a6e8102..62a853b386f2 100644
--- a/metadata/md5-cache/dev-lang/yap-6.2.2
+++ b/metadata/md5-cache/dev-lang/yap-6.2.2
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.2.2.tar.gz mirror://gentoo/yap-6.2.2-gentoo-patchset-2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62f0c0072af3ebb24d964d4f4d3745b6
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.2 b/metadata/md5-cache/dev-lang/yap-6.3.2
index 2969006f38fe..f6d0fdbeedd5 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.2
+++ b/metadata/md5-cache/dev-lang/yap-6.3.2
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp ) java? ( >=virtual/jdk-1.4 ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline sys-libs/ncurses ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.2.tar.gz mirror://gentoo/yap-6.3.2-gentoo-patchset-6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ddb1ebeef23ca864dae21ff3af799c0a
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.3 b/metadata/md5-cache/dev-lang/yap-6.3.3
index c294ec7331f3..0a0025a3e710 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.3
+++ b/metadata/md5-cache/dev-lang/yap-6.3.3
@@ -9,5 +9,5 @@ LICENSE=Artistic LGPL-2
 RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp:0 ) java? ( >=virtual/jdk-1.4:= ) mpi? ( virtual/mpi ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) R? ( dev-lang/R ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.3.tar.gz mirror://gentoo/yap-6.3.3-gentoo-patchset-4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e3ee15876cc4954554d5ae4b3a959994
diff --git a/metadata/md5-cache/dev-libs/Ice-3.5.1 b/metadata/md5-cache/dev-libs/Ice-3.5.1
index 3df8982c25d3..3e5349824f52 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.5.1
+++ b/metadata/md5-cache/dev-libs/Ice-3.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 >=dev-libs/openssl-0.9.8o:0 || ( sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) ~dev-cpp/libmcpp-2.7.2 python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) ruby? ( dev-lang/ruby:1.9 ) mono? ( dev-lang/mono ) !dev-python/IcePy !dev-ruby/IceRuby
 SLOT=0
 SRC_URI=http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.tar.gz doc? ( http://www.zeroc.com/download/Ice/3.5/Ice-3.5.1.pdf )
-_eclasses_=db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a92672cb24a82be1516f04ecfa4ae11
diff --git a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10 b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
index 680613e6e3d7..99387efbb8d8 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
+++ b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=https://github.com/OpenNI/OpenNI/archive/Stable-1.5.7.10.tar.gz -> OpenNI-1.5.7.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d90d7315696d1a1d4cb044cdc4e5d05a
diff --git a/metadata/md5-cache/dev-libs/OpenNI-9999 b/metadata/md5-cache/dev-libs/OpenNI-9999
index a6be7b469273..5698c83cc92e 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI-9999
@@ -7,5 +7,5 @@ IUSE=doc java opengl elibc_FreeBSD java
 LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d90d7315696d1a1d4cb044cdc4e5d05a
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2 b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
index 6a1497136d3e..30c0c26aa6ca 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
+++ b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=https://github.com/occipital/OpenNI2/archive/2.2-beta2.tar.gz -> OpenNI2-2.2_beta2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=151764d624a8bb50395925ed6ad0bc22
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999
index 04a019fd4267..548c054f7eb4 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI2-9999
@@ -7,5 +7,5 @@ IUSE=doc java neon opengl static-libs elibc_FreeBSD java
 LICENSE=Apache-2.0
 RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc95a3f12aaca0a0fcc53319faa75901
diff --git a/metadata/md5-cache/dev-libs/appstream-glib-0.5.9 b/metadata/md5-cache/dev-libs/appstream-glib-0.5.9
index 4d9b78abe9bd..82eb89821f51 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.5.9
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.5.9
@@ -4,10 +4,10 @@ DESCRIPTION=Provides GObjects and helper methods to read and write AppStream met
 EAPI=5
 HOMEPAGE=http://people.freedesktop.org/~hughsient/appstream-glib/
 IUSE=+introspection nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8:2 dev-libs/libyaml >=media-libs/fontconfig-2.11 >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.51.92:2.4 sys-apps/util-linux >=x11-libs/gdk-pixbuf-2.31.5:2 x11-libs/gtk+:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) !<dev-util/appdata-tools-0.1.8-r1
 SLOT=0/8
 SRC_URI=http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.5.9.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a1484626e5ee4120af885a85047b1380
+_md5_=640224444e34d33439aabfc590a7e156
diff --git a/metadata/md5-cache/dev-libs/atk-2.18.0 b/metadata/md5-cache/dev-libs/atk-2.18.0
index 7f24d01ea31b..16a24c28dea6 100644
--- a/metadata/md5-cache/dev-libs/atk-2.18.0
+++ b/metadata/md5-cache/dev-libs/atk-2.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=+introspection nls 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.18/atk-2.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b7b9473a21224318e9644c087f79961b
+_md5_=358376690954f7064ef985da161d80a8
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1
index 34e91216988b..bd5784253d76 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8 ) java? ( >=virtual/jre-1
 REQUIRED_USE=cxx? ( threads )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47d4116eecfec25b4c75d26069c30d55
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
index d9b78889108e..2822ee95bcf7 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8:= ) python? ( >=dev-lang/
 REQUIRED_USE=cxx? ( threads ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c53ea9af6b204e44b0749c081b9fe78f
diff --git a/metadata/md5-cache/dev-libs/btparser-0.26 b/metadata/md5-cache/dev-libs/btparser-0.26
index 4afa44620bc9..710aaedb1b31 100644
--- a/metadata/md5-cache/dev-libs/btparser-0.26
+++ b/metadata/md5-cache/dev-libs/btparser-0.26
@@ -4,7 +4,7 @@ DESCRIPTION=Parser and analyzer for backtraces produced by GDB
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/btparser/
 IUSE=static-libs python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=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-libs/glib-2.21:2
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/2
 SRC_URI=https://github.com/abrt/btparser/archive/0.26.tar.gz -> btparser-0.26.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f049ca0c95bbff9a7460beb2aeebcd3e
+_md5_=bb402fb8bfb3859813819d17d9cd45ba
diff --git a/metadata/md5-cache/dev-libs/clearsilver-0.10.5-r3 b/metadata/md5-cache/dev-libs/clearsilver-0.10.5-r3
index 302fa926117d..e26e891fb2b7 100644
--- a/metadata/md5-cache/dev-libs/clearsilver-0.10.5-r3
+++ b/metadata/md5-cache/dev-libs/clearsilver-0.10.5-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=java? ( >=virtual/jre-1.6 ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.clearsilver.net/downloads/clearsilver-0.10.5.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f5101e65e5874d6e18b3801ce6c8982
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
index d4afbaee7e4e..386e2bf25fcb 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r10
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[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(-)?] ) kerberos? ( >=virtual/krb5-0-r1[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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[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(-)?] ) ssl? ( !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(-)?] ) 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(-)?] ) ) java? ( >=virtual/jdk-1.4:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=baf4a1ef047624f0c42fa1bc1aa644c3
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
index 7a0278e69a86..6096711faed2 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[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(-)?] ) kerberos? ( >=virtual/krb5-0-r1[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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[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(-)?] ) ssl? ( >=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(-)?] ) java? ( >=virtual/jdk-1.4:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=973bcc48e24e5d9965725ec463289571
diff --git a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2 b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
index 45b6566072f9..32ca1d98c498 100644
--- a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
+++ b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
@@ -9,5 +9,5 @@ LICENSE=Sleepycat Apache-1.1 BSD
 RDEPEND=sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.2* sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl:0= ) java? ( >=virtual/jre-1.5 ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build(-)] java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://download-east.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-west.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-uk.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils	ad9e4720eb3e69090dd968b152fc611b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils	ad9e4720eb3e69090dd968b152fc611b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d485a7e7847e552f22f9355e366e1a26
diff --git a/metadata/md5-cache/dev-libs/efl-1.17.0 b/metadata/md5-cache/dev-libs/efl-1.17.0
new file mode 100644
index 000000000000..5eed9bf9a5de
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/efl-1.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=!!dev-libs/ecore !!dev-libs/edbus !!dev-libs/eet !!dev-libs/eeze !!dev-libs/efreet !!dev-libs/eina !!dev-libs/eio !!dev-libs/embryo !!dev-libs/eobj !!dev-libs/ephysics !!media-libs/edje !!media-libs/emotion !!media-libs/ethumb !!media-libs/evas drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.4 >=x11-libs/libxkbcommon-0.3.0 ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0 ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua:* ) physics? ( >=sci-physics/bullet-2.80 ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib virtual/jpeg:0= !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas doc? ( app-doc/doxygen ) doc? ( app-doc/doxygen )
+DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
+EAPI=5
+HOMEPAGE=http://www.enlightenment.org/
+IUSE=+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 valgrind wayland webp X xim xine xpm nls doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris
+LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
+RDEPEND=drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.4 >=x11-libs/libxkbcommon-0.3.0 ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0 ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua:* ) physics? ( >=sci-physics/bullet-2.80 ) pixman? ( x11-libs/pixman ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXp x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib virtual/jpeg:0= !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/emotion !media-libs/ethumb !media-libs/evas nls? ( sys-devel/gettext )
+REQUIRED_USE=pulseaudio? ( sound ) opengl? ( || ( X sdl wayland ) ) gles? ( || ( X wayland ) ) gles? ( !sdl ) gles? ( egl ) sdl? ( opengl ) wayland? ( egl !opengl gles ) xim? ( X )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.17.0.tar.xz
+_eclasses_=enlightenment	c185b1fa0d87798fd07fb1cd85866b23	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=c2cef2fee163532da356fc83d57afd67
diff --git a/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r1 b/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r1
index e4770806ca05..9d269757517f 100644
--- a/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r1
+++ b/metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Loki C++ library from Modern C++ Design
 EAPI=5
 HOMEPAGE=http://www.libferris.com/
 IUSE=static-libs stlport
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=stlport? ( >=dev-libs/STLport-5 ) >=dev-libs/libsigc++-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/witme/ferrisloki-3.0.13.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=228434d490692ad080cafac9d305e5df
+_md5_=9aa263b0947f325e589338e69c3d1975
diff --git a/metadata/md5-cache/dev-libs/folks-0.11.2 b/metadata/md5-cache/dev-libs/folks-0.11.2
index 2cb36a4db84e..8a6562199c01 100644
--- a/metadata/md5-cache/dev-libs/folks-0.11.2
+++ b/metadata/md5-cache/dev-libs/folks-0.11.2
@@ -4,11 +4,11 @@ DESCRIPTION=Library for aggregating people from multiple sources
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Folks
 IUSE=bluetooth eds +telepathy test tracker utils zeitgeist debug test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) >=dev-libs/glib-2.40:2 dev-libs/dbus-glib >=dev-libs/gobject-introspection-1.30:= >=dev-libs/libgee-0.10:0.8[introspection] dev-libs/libxml2 sys-libs/ncurses:0= sys-libs/readline:0= bluetooth? ( >=net-wireless/bluez-5 ) eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] ) telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] ) tracker? ( >=app-misc/tracker-1:0= ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 ) net-im/telepathy-mission-control
 REQUIRED_USE=bluetooth? ( eds )
 SLOT=0/25
 SRC_URI=mirror://gnome/sources/folks/0.11/folks-0.11.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f02457ac9c7ac0557ad45a67c86254e3
+_md5_=14fb0343bc6a7be219ea87d40f07b036
diff --git a/metadata/md5-cache/dev-libs/freexl-1.0.1 b/metadata/md5-cache/dev-libs/freexl-1.0.1
index 1bd9b1a13a84..2083a81af53d 100644
--- a/metadata/md5-cache/dev-libs/freexl-1.0.1
+++ b/metadata/md5-cache/dev-libs/freexl-1.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple XLS data extraction library
 EAPI=6
 HOMEPAGE=http://www.gaia-gis.it/gaia-sins/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ppc ppc64 x86
 LICENSE=MPL-1.1
 RDEPEND=virtual/libiconv
 SLOT=0
 SRC_URI=http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=17167fd609c9180b07c83e2ff59ffe08
+_md5_=fa21875c6be52f59e1f4ce5890b07341
diff --git a/metadata/md5-cache/dev-libs/gdl-3.18.0 b/metadata/md5-cache/dev-libs/gdl-3.18.0
index 74bed613b0a0..26c3369160ff 100644
--- a/metadata/md5-cache/dev-libs/gdl-3.18.0
+++ b/metadata/md5-cache/dev-libs/gdl-3.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME docking library
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gdl
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=dev-libs/libxml2-2.4:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=3/5
 SRC_URI=mirror://gnome/sources/gdl/3.18/gdl-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=83d3ea139330f05678888ebd67d22cc1
+_md5_=678d68ee84caaf3c1159341af3abd964
diff --git a/metadata/md5-cache/dev-libs/glib-2.46.2-r1 b/metadata/md5-cache/dev-libs/glib-2.46.2-r1
index 23b2707ede7d..07a1d7c279b5 100644
--- a/metadata/md5-cache/dev-libs/glib-2.46.2-r1
+++ b/metadata/md5-cache/dev-libs/glib-2.46.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The GLib library of C routines
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr debug python_targets_python2_7 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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2+
 PDEPEND=!<gnome-base/gvfs-1.6.4-r990 dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.46.2 >=virtual/libiconv-0-r1[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/libffi-3.0.13-r1[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(-)?] >=sys-libs/zlib-1.2.8-r1[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(-)?] selinux? ( >=sys-libs/libselinux-2.2.2-r5[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(-)?] ) xattr? ( >=sys-apps/attr-2.4.47-r1[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(-)?] ) fam? ( >=virtual/fam-0-r1[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(-)?] ) utils? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.46.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.46/glib-2.46.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2da0b19162efb39a8464b0f9ba23c036
+_md5_=dacd882640ae111cb28328e2ee9f7631
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.46.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.46.0
index 78b699f59785..9498caa2a5a3 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.46.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.46.0
@@ -4,7 +4,7 @@ DESCRIPTION=Introspection infrastructure for generating gobject library bindings
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=cairo doctool test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.46.0 >=dev-libs/glib-2.46:2 doctool? ( dev-python/mako ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 >=dev-lang/python-2.7.5-r2:2.7[xml] >=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(+)]
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 test? ( cairo )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.46/gobject-introspection-1.46.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0d1cfc75ce024b0e5d45c2547ea0b152
+_md5_=5f5fb447fd39a866a3bdf2fe2f8c989c
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.46.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.46.0
index 3c0116640775..c5267582e365 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.46.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.46.0
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=5
 HOMEPAGE=https://live.gnome.org/GObjectIntrospection/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.46.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.46/gobject-introspection-1.46.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7deec3cc6996a4bd3e32f1eb096e9a77
+_md5_=3dd728ba01989f3ccf72f62a775fdbb5
diff --git a/metadata/md5-cache/dev-libs/gom-0.3.2 b/metadata/md5-cache/dev-libs/gom-0.3.2
index 9b55c5ac8612..a7a402b3ba2b 100644
--- a/metadata/md5-cache/dev-libs/gom-0.3.2
+++ b/metadata/md5-cache/dev-libs/gom-0.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=GObject to SQLite object mapper library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Gom
 IUSE=+introspection python debug python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3.16:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gom/0.3/gom-0.3.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d5ae0b50abd1101a9b14a0eaa5141e8e
+_md5_=1dcea65d8f0db0fcc152bf0f2276311f
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.11 b/metadata/md5-cache/dev-libs/libcroco-0.6.11
index 572c9086594c..29ca516defcf 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.11
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.11
@@ -4,10 +4,10 @@ DESCRIPTION=Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/libcroco/
 IUSE=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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3: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/libxml2-2.9.1-r4[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=0.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.11.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=75843017e6dd4fdf9a731d92ed2de650
+_md5_=26edb4cbff74d4bdd4130407b95d7fbf
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.3.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.4.0.1
similarity index 79%
rename from metadata/md5-cache/dev-libs/libfilezilla-0.3.0
rename to metadata/md5-cache/dev-libs/libfilezilla-0.4.0.1
index d036c85457da..fc29ad016730 100644
--- a/metadata/md5-cache/dev-libs/libfilezilla-0.3.0
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.4.0.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=pretend
 DEPEND=test? ( dev-util/cppunit )
 DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
-EAPI=5
+EAPI=6
 HOMEPAGE=https://lib.filezilla-project.org/
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
-SRC_URI=mirror://sourceforge/filezilla/libfilezilla-0.3.0.tar.bz2
+SRC_URI=mirror://sourceforge/filezilla/libfilezilla-0.4.0.1.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5ee36736506ec3ea9207317b4532eba7
+_md5_=84fcf8a1dd41eecfa5e1aaea60f4f4c0
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.4-r1 b/metadata/md5-cache/dev-libs/libgdata-0.17.4-r1
index e3546e7d862f..88607d46e63b 100644
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.4-r1
+++ b/metadata/md5-cache/dev-libs/libgdata-0.17.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GLib-based library for accessing online service APIs using the GData
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
 IUSE=+crypt gnome-online-accounts +introspection static-libs test vala debug
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/json-glib-0.15 >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.42.0:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 SLOT=0/22
 SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=899d37f181a0562bbd326bcfd958a28e
+_md5_=df3823555eaf2992cf99f2bbe98157b6
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.23.4 b/metadata/md5-cache/dev-libs/libgit2-0.23.4
index e2b58be5b953..2f00de28c62c 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.23.4
+++ b/metadata/md5-cache/dev-libs/libgit2-0.23.4
@@ -4,10 +4,10 @@ DESCRIPTION=A linkable library for Git
 EAPI=5
 HOMEPAGE=https://libgit2.github.com/
 IUSE=examples gssapi libressl ssh test threads trace
-KEYWORDS=~amd64 ~arm ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 SLOT=0/23
 SRC_URI=https://github.com/libgit2/libgit2/archive/v0.23.4.tar.gz -> libgit2-0.23.4.tar.gz
 _eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6d2d0fb82917ce613ee59478b3889524
+_md5_=a2aca0d246d1454b2ccd89134afad3d1
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.23.10 b/metadata/md5-cache/dev-libs/libgit2-glib-0.23.10
index 07624a86dac5..4f0c788df289 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.23.10
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.23.10
@@ -4,11 +4,11 @@ DESCRIPTION=Git library for GLib
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
 IUSE=python ssh +vala python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/libgit2-0.23.0:= >=dev-libs/glib-2.44.0:2 >=dev-libs/gobject-introspection-0.10.1:= python? ( 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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ssh? ( dev-libs/libgit2[ssh] )
 REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.23/libgit2-glib-0.23.10.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3c1fa708299a20bd11bd58b0897babe6
+_md5_=5257babc512ad5a70e818916098d8172
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.2.8 b/metadata/md5-cache/dev-libs/libgusb-0.2.8
index 454c91decb67..b845a7775472 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.2.8
+++ b/metadata/md5-cache/dev-libs/libgusb-0.2.8
@@ -4,7 +4,7 @@ DESCRIPTION=GObject wrapper for libusb
 EAPI=5
 HOMEPAGE=https://github.com/hughsie/libgusb
 IUSE=+introspection static-libs vala 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 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-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(-)?] virtual/libusb:1[udev,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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.29:= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~hughsient/releases/libgusb-0.2.8.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=af644420562b5535d297e4468b3c9b5b
+_md5_=09bb32b77259198b6679b6ff1122120f
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.18.1 b/metadata/md5-cache/dev-libs/libgweather-3.18.1
index 8078dd0f2e45..529b85168beb 100644
--- a/metadata/md5-cache/dev-libs/libgweather-3.18.1
+++ b/metadata/md5-cache/dev-libs/libgweather-3.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library to access weather information from online services
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
 IUSE=glade +introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.13.5:3[introspection?] >=dev-libs/glib-2.35.1:2 >=net-libs/libsoup-2.34:2.4 >=dev-libs/libxml2-2.6.0 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !<gnome-base/gnome-applets-2.22.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=2/3-6
 SRC_URI=mirror://gnome/sources/libgweather/3.18/libgweather-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d97d926806bb4331631b6d9d7014c90f
+_md5_=a8e3bc1d59c6aad26ac4b94d51e0961a
diff --git a/metadata/md5-cache/dev-libs/libinput-1.1.5 b/metadata/md5-cache/dev-libs/libinput-1.1.5
index 9ccfbdd661ce..68aab94b808a 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.1.5
+++ b/metadata/md5-cache/dev-libs/libinput-1.1.5
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/libinput/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libevdev-0.4 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
 SRC_URI=http://www.freedesktop.org/software/libinput/libinput-1.1.5.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338
-_md5_=c052ef5aa9c8f7148b9ecc54140acfdd
+_md5_=0be41e8d9ca3cce1829b0c7dda18d8d0
diff --git a/metadata/md5-cache/dev-libs/libixion-0.11.0 b/metadata/md5-cache/dev-libs/libixion-0.11.0
new file mode 100644
index 000000000000..7df3c1cae796
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libixion-0.11.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/boost:=[threads] python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) dev-util/mdds:1=
+DESCRIPTION=General purpose formula parser & interpreter
+EAPI=6
+HOMEPAGE=https://gitlab.com/ixion/ixion
+IUSE=python static-libs python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
+LICENSE=MIT
+RDEPEND=dev-libs/boost:=[threads] python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+SLOT=0/0.11
+SRC_URI=http://kohei.us/files/ixion/src/libixion-0.11.0.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=14a3ca9dbca6c074008ecf2336978446
diff --git a/metadata/md5-cache/dev-libs/libixion-0.9.0 b/metadata/md5-cache/dev-libs/libixion-0.9.0
index 91f6566bd579..744f3c3d05bd 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.9.0
+++ b/metadata/md5-cache/dev-libs/libixion-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=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-libs/boost:=[threads] >=dev-util/mdds-0.12.0:=
+DEPEND=>=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-libs/boost:=[threads] >=dev-util/mdds-0.12.0:0=
 DESCRIPTION=General purpose formula parser & interpreter
 EAPI=5
 HOMEPAGE=https://gitlab.com/ixion/ixion
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0/0.10
 SRC_URI=http://kohei.us/files/ixion/src/libixion-0.9.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=2aef697ec466d41e36cc19ac4d4a280a
+_md5_=54cb07e70a84f5c11bee0f3e11564030
diff --git a/metadata/md5-cache/dev-libs/libixion-0.9.1 b/metadata/md5-cache/dev-libs/libixion-0.9.1
index 35b476dec860..558eb0a06a2c 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.9.1
+++ b/metadata/md5-cache/dev-libs/libixion-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/boost:=[threads] 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-util/mdds-0.12.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=dev-libs/boost:=[threads] 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-util/mdds-0.12.0: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=General purpose formula parser & interpreter
 EAPI=5
 HOMEPAGE=https://gitlab.com/ixion/ixion
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/0.10
 SRC_URI=http://kohei.us/files/ixion/src/libixion-0.9.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8d116977317d58d212b31950781cc418
+_md5_=71e9f6b42e73e12fa25c34491525283b
diff --git a/metadata/md5-cache/dev-libs/libixion-9999 b/metadata/md5-cache/dev-libs/libixion-9999
index 02bb03c1049c..a97e05609cca 100644
--- a/metadata/md5-cache/dev-libs/libixion-9999
+++ b/metadata/md5-cache/dev-libs/libixion-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=dev-libs/boost:=[threads] python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) >=dev-util/mdds-0.12.0:= >=dev-vcs/git-1.8.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
+DEPEND=dev-libs/boost:=[threads] python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) dev-util/mdds:1= >=dev-vcs/git-1.8.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
 DESCRIPTION=General purpose formula parser & interpreter
-EAPI=5
+EAPI=6
 HOMEPAGE=https://gitlab.com/ixion/ixion
-IUSE=python static-libs python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
+IUSE=python static-libs python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
 LICENSE=MIT
-RDEPEND=dev-libs/boost:=[threads] python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
-SLOT=0/0.12
+RDEPEND=dev-libs/boost:=[threads] python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+SLOT=0/0.11
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=925ea01fc0aa07d400d68f44365aad1e
+_md5_=cf8d8303b27aae5420aef883a99f8ca0
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.7.1 b/metadata/md5-cache/dev-libs/liborcus-0.7.1
index 09b5101ccdd6..91e3d264c750 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.7.1
+++ b/metadata/md5-cache/dev-libs/liborcus-0.7.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boost-1.51.0:= >=dev-libs/libixion-0.9:= sys-libs/zlib:= >=dev-util/mdds-0.8.1
+DEPEND=>=dev-libs/boost-1.51.0:= =dev-libs/libixion-0.9*:= sys-libs/zlib:= >=dev-util/mdds-0.8.1:0
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=5
 HOMEPAGE=https://gitlab.com/orcus/orcus
 IUSE=static-libs
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.51.0:= >=dev-libs/libixion-0.9:= sys-libs/zlib:=
+RDEPEND=>=dev-libs/boost-1.51.0:= =dev-libs/libixion-0.9*:= sys-libs/zlib:=
 SLOT=0
 SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.7.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=488af9ddd239e216414ca2820e3703f3
+_md5_=28db6f21dd45371404324c12b8062ade
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.7.1-r1 b/metadata/md5-cache/dev-libs/liborcus-0.7.1-r1
new file mode 100644
index 000000000000..e27e10d070d8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liborcus-0.7.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/boost-1.51.0:= sys-libs/zlib:= spreadsheet-model? ( =dev-libs/libixion-0.9*:= ) >=dev-util/mdds-0.8.1:0
+DESCRIPTION=Standalone file import filter library for spreadsheet documents
+EAPI=6
+HOMEPAGE=https://gitlab.com/orcus/orcus
+IUSE=+spreadsheet-model static-libs tools
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/boost-1.51.0:= sys-libs/zlib:= spreadsheet-model? ( =dev-libs/libixion-0.9*:= )
+SLOT=0
+SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.7.1.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=439a40f8b191c790bc30bfdb72b98983
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.9.2 b/metadata/md5-cache/dev-libs/liborcus-0.9.2-r1
similarity index 56%
rename from metadata/md5-cache/dev-libs/liborcus-0.9.2
rename to metadata/md5-cache/dev-libs/liborcus-0.9.2-r1
index 160530078efb..8ca7dba3ffdd 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.9.2
+++ b/metadata/md5-cache/dev-libs/liborcus-0.9.2-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boost-1.51.0:= =dev-libs/libixion-0.9*:= sys-libs/zlib:= >=dev-util/mdds-0.11
+DEPEND=>=dev-libs/boost-1.51.0:= sys-libs/zlib:= spreadsheet-model? ( =dev-libs/libixion-0.9*:= ) >=dev-util/mdds-0.11:0
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
-EAPI=5
+EAPI=6
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
-IUSE=static-libs
+IUSE=+spreadsheet-model static-libs tools
 LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.51.0:= =dev-libs/libixion-0.9*:= sys-libs/zlib:=
+RDEPEND=>=dev-libs/boost-1.51.0:= sys-libs/zlib:= spreadsheet-model? ( =dev-libs/libixion-0.9*:= )
 SLOT=0/0.10
 SRC_URI=http://kohei.us/files/orcus/src/liborcus-0.9.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9d08dbda137ca05df88accea2630f66c
+_md5_=3bf88c0cd0ba93c845bb5991af3acb6b
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index a36c414bae66..d800852b59f1 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -1,11 +1,12 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=dev-libs/boost-1.51.0:= =dev-libs/libixion-0.9*:= sys-libs/zlib:= >=dev-util/mdds-0.11 >=dev-vcs/git-1.8.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
+DEFINED_PHASES=configure install prepare setup unpack
+DEPEND=>=dev-libs/boost-1.51.0:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spreadsheet-model? ( =dev-libs/libixion-9999:= ) dev-util/mdds:1 >=dev-vcs/git-1.8.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
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
-EAPI=5
+EAPI=6
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
-IUSE=static-libs
+IUSE=python +spreadsheet-model static-libs tools python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
 LICENSE=MIT
-RDEPEND=>=dev-libs/boost-1.51.0:= =dev-libs/libixion-0.9*:= sys-libs/zlib:=
-SLOT=0/0.10
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f09bcc7857089c31d6cc2c0f6e6f5b42
+RDEPEND=>=dev-libs/boost-1.51.0:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spreadsheet-model? ( =dev-libs/libixion-9999:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+SLOT=0/0.11
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ae79b7fe7f25f4015a7f6acf467b7bfb
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.16.0 b/metadata/md5-cache/dev-libs/libpeas-1.16.0
index f8e964807d15..51db746107bd 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.16.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.16.0
@@ -4,11 +4,11 @@ DESCRIPTION=A GObject plugins library
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/libpeas/stable/
 IUSE=+gtk glade jit lua +python python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= glade? ( >=dev-util/glade-3.9.1:3.10 ) gtk? ( >=x11-libs/gtk+-3:3[introspection] ) lua? ( >=dev-lua/lgi-0.9.0 jit? ( >=dev-lang/luajit-2:2 ) !jit? ( =dev-lang/lua-5.1*:0 ) ) python? ( 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(-)] >=dev-python/pygobject-3.2:3[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? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) ?? ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.16/libpeas-1.16.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6864639fb8919ff61cc8595958a168fd
+_md5_=4ad4c4db0f2e548a9363480af8bf4cfb
diff --git a/metadata/md5-cache/dev-libs/librevenge-9999 b/metadata/md5-cache/dev-libs/librevenge-9999
index 9ab134e03522..3d793dac3f89 100644
--- a/metadata/md5-cache/dev-libs/librevenge-9999
+++ b/metadata/md5-cache/dev-libs/librevenge-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-libs/boost:= sys-libs/zlib[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? ( app-doc/doxygen ) test? ( dev-util/cppunit[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-vcs/git-1.8.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
 DESCRIPTION=A helper library for REVerse ENGineered formats filters
-EAPI=5
+EAPI=6
 HOMEPAGE=http://sf.net/p/libwpd/librevenge
 IUSE=doc 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
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/boost:= sys-libs/zlib[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=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=54922c65377f1037721105c8774c9685
+_md5_=6d0d5143ed1fa5d55d78833d930354e5
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.6.2 b/metadata/md5-cache/dev-libs/libsigc++-2.6.2
index ae76745de781..cf2d346050e8 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.6.2
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.6.2
@@ -4,9 +4,9 @@ DESCRIPTION=Typesafe callback system for standard C++
 EAPI=5
 HOMEPAGE=http://libsigc.sourceforge.net/
 IUSE=doc static-libs 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.6/libsigc++-2.6.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=515273810c7518a8a4eab625e88318ab
+_md5_=da5787db14766ec5515f3c846a1511a3
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.3 b/metadata/md5-cache/dev-libs/libxml2-2.9.3
index baeb7ee03c1d..333d7fc6f174 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.3
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.3
@@ -4,10 +4,10 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=5
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[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(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[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(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=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(-)] ) readline? ( sys-libs/readline:= )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.3.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	e7f2b9c6e57342e5d25eac22fce23062	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=515c668e96b9f5b2dfc895670e444fd9
+_md5_=c161380da2a03cc7ba20d74a7e5db5b2
diff --git a/metadata/md5-cache/dev-libs/link-grammar-4.8.6 b/metadata/md5-cache/dev-libs/link-grammar-4.8.6
index b0fe14b9ccb0..01fb057704b7 100644
--- a/metadata/md5-cache/dev-libs/link-grammar-4.8.6
+++ b/metadata/md5-cache/dev-libs/link-grammar-4.8.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.abisource.com/downloads/link-grammar/4.8.6/link-grammar-4.8.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=affaaf5e21d7f128d3daf9bf2ebee83c
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.3.3-r1 b/metadata/md5-cache/dev-libs/link-grammar-5.3.3-r1
index d8908fd3c19f..e23a2971f2e8 100644
--- a/metadata/md5-cache/dev-libs/link-grammar-5.3.3-r1
+++ b/metadata/md5-cache/dev-libs/link-grammar-5.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=https://github.com/opencog/link-grammar/archive/link-grammar-5.3.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ce64aac208c92587146276de51245747
diff --git a/metadata/md5-cache/dev-libs/npth-1.2 b/metadata/md5-cache/dev-libs/npth-1.2
index 02cfaffc58dd..10f09e9734f7 100644
--- a/metadata/md5-cache/dev-libs/npth-1.2
+++ b/metadata/md5-cache/dev-libs/npth-1.2
@@ -3,9 +3,9 @@ DESCRIPTION=New GNU Portable Threads Library
 EAPI=5
 HOMEPAGE=http://thread.gmane.org/gmane.comp.encryption.gpg.announce/179
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5c7ba8dbe67d9a349e214d6fd0083d1c
+_md5_=821660fc348c080dc6d801f5727c426a
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.4.1 b/metadata/md5-cache/dev-libs/protobuf-2.4.1
index 8b8e4343de93..a1b2e62b7960 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.4.1
+++ b/metadata/md5-cache/dev-libs/protobuf-2.4.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) )
 SLOT=0
 SRC_URI=https://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils	ad9e4720eb3e69090dd968b152fc611b	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils	ad9e4720eb3e69090dd968b152fc611b	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9270e433a78bc2aec2da57f88bc09cf0
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2 b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
index ddaf0fdad435..a9e95c56885d 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4ea8f78330c61d7c167776e881bcfd3
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3 b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
index c86f0948632a..d0e3184d0bd4 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
+++ b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) )
 SLOT=0/9
 SRC_URI=https://github.com/google/protobuf/releases/download/2.6.1/protobuf-2.6.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f408c11147d9b3b8cab8f58eb8e08d3a
diff --git a/metadata/md5-cache/dev-libs/smack-0.5.0 b/metadata/md5-cache/dev-libs/smack-0.5.0
index fd32de0110f8..89aa5bafdd63 100644
--- a/metadata/md5-cache/dev-libs/smack-0.5.0
+++ b/metadata/md5-cache/dev-libs/smack-0.5.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/snappy sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=app-arch/snappy dev-libs/boost sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=low-level IO storage which packs data into sorted compressed blobs
 EAPI=4
 HOMEPAGE=http://reverbrain.com/smack/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=app-arch/snappy
+RDEPEND=app-arch/snappy dev-libs/boost
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~patrick/smack-0.5.0.tar.bz2
 _eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=881cc178bd5484739430d18d7d41799d
+_md5_=acc2c746f86ca3fa15e3cd5bd2d9e147
diff --git a/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.6 b/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.6
index 4dce60e82db9..f458df814d61 100644
--- a/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.6
+++ b/metadata/md5-cache/dev-libs/totem-pl-parser-3.10.6
@@ -4,10 +4,10 @@ DESCRIPTION=Playlist parsing library
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/totem-pl-parser/stable/
 IUSE=archive crypt +introspection +quvi test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/gmime:2.6 >=net-libs/libsoup-2.43:2.4 archive? ( >=app-arch/libarchive-3 ) crypt? ( dev-libs/libgcrypt:0= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) quvi? ( >=media-libs/libquvi-0.9.1:0= )
 SLOT=0/18
 SRC_URI=mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.6.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2e76078a7872cd95754dbfdb2347e1d8
+_md5_=02356000c261ee64520310096197dec2
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-0.4.1 b/metadata/md5-cache/dev-libs/urdfdom_headers-0.4.1
new file mode 100644
index 000000000000..1ceb4fdc8e21
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-0.4.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=URDF (U-Robot Description Format) headers
+EAPI=5
+HOMEPAGE=http://ros.org/wiki/urdf
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/ros/urdfdom_headers/archive/0.4.1.tar.gz -> urdfdom_headers-0.4.1.tar.gz
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4cd7bceabf96d1e8673982d7d62b231a
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.30.1 b/metadata/md5-cache/dev-libs/vala-common-0.30.1
index 838580f329c5..4845df8ea720 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.30.1
+++ b/metadata/md5-cache/dev-libs/vala-common-0.30.1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.30/vala-0.30.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=47de9eb9097aaf782ed2b195b830ea73
+_md5_=b3ff43bcb3c6a676eca34054d77a8e23
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.22 b/metadata/md5-cache/dev-libs/xapian-1.2.22
index 154d584df4f3..d71ba2f9a827 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.2.22
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.22
@@ -4,10 +4,10 @@ DESCRIPTION=Xapian Probabilistic Information Retrieval library
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0/1.2.22
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.22/xapian-core-1.2.22.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b44bbb15c1f39b1395ef9cef3202a168
+_md5_=a371a08d8d471cd6866e77169a4c2525
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.19 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.19
index c9e1887e845b..0a2fe54ac8e4 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.19
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.19
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/xapian-1.2.19* lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/pe
 REQUIRED_USE=|| ( java lua perl php python ruby tcl ) php? ( || ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.19/xapian-bindings-1.2.19.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4191180e75c82e812eb03731814d58c
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.22 b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.22
index 2d3bc7225fd5..cf004fdbbd49 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.22
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.22
@@ -4,11 +4,11 @@ DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=5
 HOMEPAGE=http://www.xapian.org/
 IUSE=java lua perl php python ruby tcl elibc_FreeBSD java php_targets_php5-5 python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/1.2.22 lua? ( dev-lang/lua:0 ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:= ) tcl? ( >=dev-lang/tcl-8.1:0= ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.2.0 ) php? ( php_targets_php5-5? ( dev-lang/php:5.5 ) )
 REQUIRED_USE=|| ( java lua perl php python ruby tcl ) php? ( || ( php_targets_php5-5 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.2.22/xapian-bindings-1.2.22.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ae04037503c8eb7f7a238645681b6fc6
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4595adfbb4d34fea9b37c37e61fdefde
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.3.4 b/metadata/md5-cache/dev-libs/xapian-bindings-1.3.4
index fc5c682aeebd..c6e982036a21 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.3.4
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/xapian:0/1.3.5 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:=
 REQUIRED_USE=python? ( python_targets_python2_7 ) php? ( || ( php_targets_php5-5 php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=http://oligarchy.co.uk/xapian/1.3.4/xapian-bindings-1.3.4.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d474a46c4a95b9e275e0ceab2d4b1d8
diff --git a/metadata/md5-cache/dev-lisp/abcl-0.0.9-r1 b/metadata/md5-cache/dev-lisp/abcl-0.0.9-r1
index 9464ec4bffdc..2a4939f28d94 100644
--- a/metadata/md5-cache/dev-lisp/abcl-0.0.9-r1
+++ b/metadata/md5-cache/dev-lisp/abcl-0.0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 jad? ( dev-java/jad-bin ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://armedbear.org/abcl-0.0.9.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=afedb3775fbd70853695be04e836385a
diff --git a/metadata/md5-cache/dev-lisp/abcl-0.20.0 b/metadata/md5-cache/dev-lisp/abcl-0.20.0
index 1fd8464c5618..264ceea0b880 100644
--- a/metadata/md5-cache/dev-lisp/abcl-0.20.0
+++ b/metadata/md5-cache/dev-lisp/abcl-0.20.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 jad? ( dev-java/jad-bin ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://common-lisp.net/project/armedbear/releases/abcl-src-0.20.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33894c0196e94bd8597112278ab28c97
diff --git a/metadata/md5-cache/dev-ml/macaque-0.7.4 b/metadata/md5-cache/dev-ml/macaque-0.7.4
new file mode 100644
index 000000000000..a15a75536f89
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/macaque-0.7.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/pgocaml-2.1:= dev-ml/camlp4:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=DSL for SQL Queries in Caml
+EAPI=5
+HOMEPAGE=http://ocsigen.org/macaque/
+IUSE=+ocamlopt debug
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-ml/pgocaml-2.1:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/0.7.4
+SRC_URI=https://github.com/ocsigen/macaque/archive/0.7.4.tar.gz -> macaque-0.7.4.tar.gz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	3972ca401cf7dbb430df9995f5d8d580	oasis	dab31007fb098ff15db810bfe5001e64	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=0800f5da2ec4bda1d9cfc23d2949defc
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-1.9.0 b/metadata/md5-cache/dev-ml/ocaml-cstruct-1.9.0
new file mode 100644
index 000000000000..4dacc18249ba
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-cstruct-1.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-ml/ounit ) async? ( dev-ml/async:= ) camlp4? ( dev-ml/camlp4:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= ) >=dev-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=Map OCaml arrays onto C-like structs
+EAPI=5
+HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
+IUSE=async +camlp4 +lwt +ppx +ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=async? ( dev-ml/async:= ) camlp4? ( dev-ml/camlp4:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= ) >=dev-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/1.9.0
+SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v1.9.0.tar.gz -> ocaml-cstruct-1.9.0.tar.gz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	3972ca401cf7dbb430df9995f5d8d580	oasis	dab31007fb098ff15db810bfe5001e64	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=f8eefdf5dee5bf7544ba5b8e3df8c203
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.4.2
new file mode 100644
index 000000000000..7ef33c566ac1
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Library for binding to C libraries using pure OCaml
+EAPI=5
+HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi
+SLOT=0/0.4.2
+SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.4.2.tar.gz -> ocaml-ctypes-0.4.2.tar.gz
+_eclasses_=findlib	9909e5ca0f77ff5b693885a3d7aeadb7
+_md5_=a9cd8564fc646f138408a03116147fd6
diff --git a/metadata/md5-cache/dev-ml/pgocaml-2.3 b/metadata/md5-cache/dev-ml/pgocaml-2.3
new file mode 100644
index 000000000000..d0b4c727b744
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pgocaml-2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-ml/calendar:= dev-ml/csv:= dev-ml/pcre-ocaml:= camlp4? ( dev-ml/camlp4:= ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=PG'OCaml is a set of OCaml bindings for the PostgreSQL database
+EAPI=5
+HOMEPAGE=http://pgocaml.forge.ocamlcore.org/
+IUSE=camlp4 doc +ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/calendar:= dev-ml/csv:= dev-ml/pcre-ocaml:= camlp4? ( dev-ml/camlp4:= ) >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/2.3
+SRC_URI=http://forge.ocamlcore.org/frs/download.php/1597/pgocaml-2.3.tgz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	3972ca401cf7dbb430df9995f5d8d580	oasis	dab31007fb098ff15db810bfe5001e64	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=940e16e4d61fdd2d9956400fa97c8d11
diff --git a/metadata/md5-cache/dev-ml/yojson-1.3.1 b/metadata/md5-cache/dev-ml/yojson-1.3.1
new file mode 100644
index 000000000000..9e5ecfd3120f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/yojson-1.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] dev-ml/biniou:=[ocamlopt] dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=JSON parsing and pretty-printing library for OCaml
+EAPI=5
+HOMEPAGE=http://mjambon.com/yojson.html
+IUSE=examples
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] dev-ml/biniou:=[ocamlopt]
+SLOT=0/1.3.1
+SRC_URI=https://github.com/mjambon/yojson/archive/v1.3.1.tar.gz -> yojson-1.3.1.tar.gz
+_eclasses_=findlib	9909e5ca0f77ff5b693885a3d7aeadb7
+_md5_=bb6298222d6f968d578d40cdd02e56d4
diff --git a/metadata/md5-cache/dev-perl/Data-FormValidator-4.810.0 b/metadata/md5-cache/dev-perl/Data-FormValidator-4.810.0-r1
similarity index 64%
rename from metadata/md5-cache/dev-perl/Data-FormValidator-4.810.0
rename to metadata/md5-cache/dev-perl/Data-FormValidator-4.810.0-r1
index 38c6865e9cfe..db9f8992f62b 100644
--- a/metadata/md5-cache/dev-perl/Data-FormValidator-4.810.0
+++ b/metadata/md5-cache/dev-perl/Data-FormValidator-4.810.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/ImageSize >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.17 >=dev-perl/MIME-Types-1.005 dev-perl/regexp-common >=dev-perl/Perl6-Junction-1.10 dev-perl/Email-Valid dev-perl/Module-Build dev-lang/perl:=[-build(-)]
+DEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.17 >=dev-perl/MIME-Types-1.005 dev-perl/regexp-common >=dev-perl/Perl6-Junction-1.10 dev-perl/Email-Valid dev-perl/Module-Build dev-lang/perl:=[-build(-)]
 DESCRIPTION=Validates user input (usually from an HTML form) based on input profile
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Data-FormValidator/
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/ImageSize >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.17 >=dev-perl/MIME-Types-1.005 dev-perl/regexp-common >=dev-perl/Perl6-Junction-1.10 dev-perl/Email-Valid dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.17 >=dev-perl/MIME-Types-1.005 dev-perl/regexp-common >=dev-perl/Perl6-Junction-1.10 dev-perl/Email-Valid dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/Data-FormValidator-4.81.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=d941df85da0a35b77d1864904d3f2081
+_md5_=e74c61d664311bf10519c2202fd05670
diff --git a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.150.0-r1 b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.150.0-r1
deleted file mode 100644
index f7ed79e30d32..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.150.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/HTML-Parser-3.25 dev-perl/Module-Build virtual/perl-Test-Simple dev-perl/Sub-Override dev-lang/perl:=[-build(-)]
-DESCRIPTION=A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions
-EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/HTML-TokeParser-Simple/
-KEYWORDS=amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/HTML-Parser-3.25 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.15.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=260180f5f925b02c5b35b83a1258e32a
diff --git a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1 b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
index 7b9244b79dbd..c80ab14d7944 100644
--- a/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
+++ b/metadata/md5-cache/dev-perl/HTML-TokeParser-Simple-3.160.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-perl/HTML-Parser-3.25 dev-perl/Module-Build virtual/perl-Test-Simple dev-perl/Sub-Override dev-lang/perl:=[-build(-)]
-DESCRIPTION=A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions
+DESCRIPTION=Easy to use HTML::TokeParser interface
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/HTML-TokeParser-Simple/
 KEYWORDS=amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/HTML-Parser-3.25 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=955e5e80db64b0bde974f2e4340d035c
+_md5_=fec65ad7a227f19cea30a39e2488eadb
diff --git a/metadata/md5-cache/dev-perl/ImageInfo-1.340.0 b/metadata/md5-cache/dev-perl/Image-Info-1.340.0
similarity index 95%
rename from metadata/md5-cache/dev-perl/ImageInfo-1.340.0
rename to metadata/md5-cache/dev-perl/Image-Info-1.340.0
index 4a3e323bd143..357ce869accb 100644
--- a/metadata/md5-cache/dev-perl/ImageInfo-1.340.0
+++ b/metadata/md5-cache/dev-perl/Image-Info-1.340.0
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/IO-String-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-la
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.34.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=01983fb714e5614d3c7f1d9ccfd313c5
+_md5_=64034299d3ce5eb2d34fd9246746f9a4
diff --git a/metadata/md5-cache/dev-perl/ImageInfo-1.360.0 b/metadata/md5-cache/dev-perl/Image-Info-1.360.0
similarity index 95%
rename from metadata/md5-cache/dev-perl/ImageInfo-1.360.0
rename to metadata/md5-cache/dev-perl/Image-Info-1.360.0
index 552ad7eaa675..f02ed4ca6607 100644
--- a/metadata/md5-cache/dev-perl/ImageInfo-1.360.0
+++ b/metadata/md5-cache/dev-perl/Image-Info-1.360.0
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/IO-String-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-la
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.36.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=4a2f6356e89c31a238eb9894fcb685fd
+_md5_=c61bb1af0201cb3959ad4a51c99428ca
diff --git a/metadata/md5-cache/dev-perl/ImageInfo-1.380.0 b/metadata/md5-cache/dev-perl/Image-Info-1.380.0
similarity index 95%
rename from metadata/md5-cache/dev-perl/ImageInfo-1.380.0
rename to metadata/md5-cache/dev-perl/Image-Info-1.380.0
index 53e27ec22022..6f22b85a4e81 100644
--- a/metadata/md5-cache/dev-perl/ImageInfo-1.380.0
+++ b/metadata/md5-cache/dev-perl/Image-Info-1.380.0
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/IO-String-1.01 dev-perl/XML-LibXML dev-perl/XML-Simple dev-la
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.38.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=2fdd76d5da29274c4f5a17599d9c8907
+_md5_=99250710ba46c2b97e8394174252075f
diff --git a/metadata/md5-cache/dev-perl/ImageSize-3.232.0-r1 b/metadata/md5-cache/dev-perl/Image-Size-3.232.0-r1
similarity index 95%
rename from metadata/md5-cache/dev-perl/ImageSize-3.232.0-r1
rename to metadata/md5-cache/dev-perl/Image-Size-3.232.0-r1
index 214455db5133..0b61cbe8c556 100644
--- a/metadata/md5-cache/dev-perl/ImageSize-3.232.0-r1
+++ b/metadata/md5-cache/dev-perl/Image-Size-3.232.0-r1
@@ -9,4 +9,4 @@ RDEPEND=virtual/perl-IO-Compress virtual/perl-File-Spec dev-lang/perl:=[-build(-
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.232.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=585823eed55d52b3e47dbb88c91cc9a7
+_md5_=276be921382c7f255932d57274117ed7
diff --git a/metadata/md5-cache/dev-perl/ImageSize-3.300.0 b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
similarity index 95%
rename from metadata/md5-cache/dev-perl/ImageSize-3.300.0
rename to metadata/md5-cache/dev-perl/Image-Size-3.300.0
index c20b9bd98d0a..2230877bfe5e 100644
--- a/metadata/md5-cache/dev-perl/ImageSize-3.300.0
+++ b/metadata/md5-cache/dev-perl/Image-Size-3.300.0
@@ -10,4 +10,4 @@ RDEPEND=virtual/perl-IO-Compress >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=a0d5dee7510d84f805bf20ab46889ff3
+_md5_=d7a2168d20ba9b1a101eeab5aae37a74
diff --git a/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0 b/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
new file mode 100644
index 000000000000..54868e8a1681
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/LWP-UserAgent-Determined-1.70.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/libwww-perl virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=A virtual browser that retries errors
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/LWP-UserAgent-Determined/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/libwww-perl dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=ed15ead6c867fea972e041b16bca3e93
diff --git a/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.100.0 b/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.100.0
new file mode 100644
index 000000000000..cb2e0761f4fc
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/LWPx-ParanoidAgent-1.100.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/libwww-perl dev-perl/Net-DNS virtual/perl-Time-HiRes >=dev-perl/Crypt-SSLeay-0.580.0 dev-lang/perl:=
+DESCRIPTION=Subclass of LWP::UserAgent that protects you from harm
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/LWPx-ParanoidAgent/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/libwww-perl dev-perl/Net-DNS virtual/perl-Time-HiRes >=dev-perl/Crypt-SSLeay-0.580.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-1.10.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=f5a6a45c4be1416599a294c21fef0552
diff --git a/metadata/md5-cache/dev-perl/Lexical-Persistence-1.23.0 b/metadata/md5-cache/dev-perl/Lexical-Persistence-1.23.0
new file mode 100644
index 000000000000..e7ab661bd760
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lexical-Persistence-1.23.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/PadWalker-1.960.0 >=dev-perl/Devel-LexAlias-0.50.0 >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( >=virtual/perl-Carp-1.260.0 >=virtual/perl-Scalar-List-Utils-1.290.0 >=virtual/perl-Test-Simple-0.980.0 ) dev-lang/perl:=
+DESCRIPTION=Bind lexicals to persistent data
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Lexical-Persistence/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/PadWalker-1.960.0 >=dev-perl/Devel-LexAlias-0.50.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/Lexical-Persistence-1.023.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=6cb39aef974fc65188217783dbe31580
diff --git a/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.40.0 b/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.40.0
new file mode 100644
index 000000000000..90a0d1c80680
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lingua-EN-Numbers-Ordinate-1.40.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=
+DESCRIPTION=Convert cardinal numbers(3) to ordinal numbers(3rd)
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Lingua-EN-Numbers-Ordinate/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Exporter dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Numbers-Ordinate-1.04.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=dae1b01dbc090a835674e2bf40b7f33c
diff --git a/metadata/md5-cache/dev-perl/Lingua-PT-Stemmer-0.20.0 b/metadata/md5-cache/dev-perl/Lingua-PT-Stemmer-0.20.0
new file mode 100644
index 000000000000..b884f4cf0a35
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lingua-PT-Stemmer-0.20.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test ) dev-lang/perl:=
+DESCRIPTION=Portuguese language stemming
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Lingua-PT-Stemmer/
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=0d477ae104d0c72b71c638f88a5d0dca
diff --git a/metadata/md5-cache/dev-perl/Lingua-Stem-Ru-0.40.0 b/metadata/md5-cache/dev-perl/Lingua-Stem-Ru-0.40.0
new file mode 100644
index 000000000000..668f9da99814
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lingua-Stem-Ru-0.40.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Porter's stemming algorithm for Russian (KOI8-R only)
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Lingua-Stem-Ru/
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=7d8e731e16b9993ecc8bbb4eb7f47b2f
diff --git a/metadata/md5-cache/dev-perl/Log-Any-1.38.0 b/metadata/md5-cache/dev-perl/Log-Any-1.38.0
new file mode 100644
index 000000000000..f5be0eee7ef2
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Log-Any-1.38.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-Test-Simple >=virtual/perl-ExtUtils-MakeMaker-6.170.0 test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) virtual/perl-File-Spec virtual/perl-File-Temp ) dev-lang/perl:=
+DESCRIPTION=Bringing loggers and listeners together
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Log-Any/
+IUSE=test minimal
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-IO virtual/perl-Test-Simple dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Log-Any-1.038.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=2f3d24ee0168845e56a859e25ab1f7ff
diff --git a/metadata/md5-cache/dev-perl/Log-Dispatch-2.540.0 b/metadata/md5-cache/dev-perl/Log-Dispatch-2.540.0
new file mode 100644
index 000000000000..9ce8aa26bdfb
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Log-Dispatch-2.540.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode dev-perl/Module-Runtime virtual/perl-IO >=virtual/perl-JSON-PP-2.273.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Sys-Syslog-0.280.0 >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long dev-perl/IPC-Run3 virtual/perl-IO dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Test-Requires ) dev-lang/perl:=
+DESCRIPTION=Dispatches messages to one or more outputs
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Log-Dispatch/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86 ~ppc-aix
+LICENSE=Artistic-2
+RDEPEND=virtual/perl-Carp dev-perl/Devel-GlobalDestruction >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Encode dev-perl/Module-Runtime virtual/perl-IO >=virtual/perl-JSON-PP-2.273.0 >=dev-perl/Params-Validate-1.30.0 virtual/perl-Scalar-List-Utils >=virtual/perl-Sys-Syslog-0.280.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.54.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=265f62f8a338a0052a5e901d59a4d713
diff --git a/metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r1 b/metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r2
similarity index 79%
rename from metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r1
rename to metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r2
index 11d8e1f91990..887cb7fb0a10 100644
--- a/metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r1
+++ b/metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r2
@@ -6,8 +6,8 @@ HOMEPAGE=http://search.cpan.org/dist/Panotools-Script/
 IUSE=gui
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/URI dev-perl/libwww-perl >=dev-perl/ImageSize-2.9 >=media-libs/exiftool-6 gui? ( gnome-extra/zenity ) dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/URI dev-perl/libwww-perl >=dev-perl/Image-Size-2.900.0 >=media-libs/exiftool-6 gui? ( gnome-extra/zenity ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BP/BPOSTLE/Panotools-Script-0.28.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=3d49038912edc3b06ab5d258b666f749
+_md5_=337cb458c6ad8e7ce01812bc2f6b32d3
diff --git a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r1 b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
similarity index 81%
rename from metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r1
rename to metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
index ee68e2d6d7fc..8a4df34b4359 100644
--- a/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r1
+++ b/metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/ImageSize dev-lang/perl:=[-build(-)]
+DEPEND=dev-perl/Image-Size dev-lang/perl:=[-build(-)]
 DESCRIPTION=RTF::Writer - for generating documents in Rich Text Format
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/RTF-Writer/
 KEYWORDS=~amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/ImageSize dev-lang/perl:=[-build(-)]
+RDEPEND=dev-perl/Image-Size dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBURKE/RTF-Writer-1.11.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=b0eb1aa06afeafff52887b46095d1c29
+_md5_=6c59d4fdbce0daccd23147a3998dd341
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.22.0 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.22.0
index ddc25e9ac16a..27619da60b08 100644
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.22.0
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl XS frontend to the Xapian C++ search library
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Search-Xapian/
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.22.0.tar.gz http://oligarchy.co.uk/xapian/1.2.22/Search-Xapian-1.2.22.0.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f2d804eba4b5698ce6a5f68acabbcba2
+_md5_=59412749fc4fd3643aa4a25c8c1ef403
diff --git a/metadata/md5-cache/dev-perl/local-lib-2.0.18 b/metadata/md5-cache/dev-perl/local-lib-2.0.18
new file mode 100644
index 000000000000..eb4aaa930db8
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/local-lib-2.0.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/perl-CPAN-1.820.0 >=virtual/perl-ExtUtils-Install-1.430.0 >=virtual/perl-ExtUtils-MakeMaker-7.0.0 >=dev-perl/Module-Build-0.360.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=create and use a local lib/ for perl modules with PERL5LIB
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/local-lib/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-CPAN-1.820.0 >=virtual/perl-ExtUtils-Install-1.430.0 >=virtual/perl-ExtUtils-MakeMaker-7.0.0 >=dev-perl/Module-Build-0.360.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000018.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c
+_md5_=5098b1e7546330486afdc995f830d85f
diff --git a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.3.5 b/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.3.5
deleted file mode 100644
index 652c590589f0..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=Tokenises PHP code and detects violations of a defined set of coding standards
-EAPI=4
-HOMEPAGE=http://pear.php.net/PHP_CodeSniffer
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/PHP_CodeSniffer-1.3.5.tgz
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4eb7a46b7e9d50102e0f3000030d4692
diff --git a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.4.7 b/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.4.7
deleted file mode 100644
index 863f036a73ea..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.4.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=Tokenises PHP code and detects violations of a defined set of coding standards
-EAPI=4
-HOMEPAGE=http://pear.php.net/PHP_CodeSniffer
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/PHP_CodeSniffer-1.4.7.tgz
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4eb7a46b7e9d50102e0f3000030d4692
diff --git a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.5.0_rc4 b/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.5.0_rc4
deleted file mode 100644
index c4c765dbd2b2..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-1.5.0_rc4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Tokenises PHP code and detects violations of a defined set of coding standards
-EAPI=5
-HOMEPAGE=http://pear.php.net/PHP_CodeSniffer
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/PHP_CodeSniffer-1.5.0RC4.tgz
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d99f9b00edc3c103d365dde7540d7be8
diff --git a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-2.3.0 b/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-2.3.0
deleted file mode 100644
index d6cbd4268358..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Tokenises PHP code and detects violations of a defined set of coding standards
-EAPI=5
-HOMEPAGE=http://pear.php.net/PHP_CodeSniffer
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/php-5.1.2:*[cli] dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/PHP_CodeSniffer-2.3.0.tgz
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	php-pear-r1	7d1434952f2d1483feac6ad812d605dd	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9d9f7877e88f115d1eb99b7d8c97ad43
diff --git a/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-2.5.1 b/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-2.5.1
new file mode 100644
index 000000000000..505c2480c786
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-PHP_CodeSniffer-2.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install test
+DEPEND=test? ( >=dev-php/phpunit-4 )
+DESCRIPTION=Detect violations of PHP code standards
+EAPI=6
+HOMEPAGE=https://github.com/squizlabs/PHP_CodeSniffer
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/php:*[cli,tokenizer,xmlwriter]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/squizlabs/PHP_CodeSniffer/archive/2.5.1.tar.gz -> PEAR-PHP_CodeSniffer-2.5.1.tar.gz
+_md5_=6269d2a2c0154c2920c68ebc5a69401c
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.25.0 b/metadata/md5-cache/dev-python/PyGithub-1.25.0
deleted file mode 100644
index df54fdc2dd5e..000000000000
--- a/metadata/md5-cache/dev-python/PyGithub-1.25.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_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=Python library to access the Github API v3
-EAPI=5
-HOMEPAGE=https://github.com/jacquev6/PyGithub/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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 ) >=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/jacquev6/PyGithub/archive/v1.25.0.tar.gz -> PyGithub-1.25.0.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f2a9d57bee4e59813f5ba33579b93cd7
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.25.1 b/metadata/md5-cache/dev-python/PyGithub-1.25.1
deleted file mode 100644
index a344c4056a57..000000000000
--- a/metadata/md5-cache/dev-python/PyGithub-1.25.1
+++ /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_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=Python library to access the Github API v3
-EAPI=5
-HOMEPAGE=https://github.com/jacquev6/PyGithub/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-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 ) >=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/jacquev6/PyGithub/archive/v1.25.1.tar.gz -> PyGithub-1.25.1.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=cab8f060082c65f4a7c056b9774060c5
diff --git a/metadata/md5-cache/dev-python/click-6.3 b/metadata/md5-cache/dev-python/click-6.3
new file mode 100644
index 000000000000..29320ba567fa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/click-6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( virtual/pypy3: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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A Python package for creating beautiful command line interfaces
+EAPI=6
+HOMEPAGE=http://click.pocoo.org/ https://pypi.python.org/pypi/click
+IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/c/click/click-6.3.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=adda85b294a3ef7c1786c7f32b1a867d
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.3 b/metadata/md5-cache/dev-python/colorama-0.3.3
index 8b9801692966..a2988c1afa0f 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.3
+++ b/metadata/md5-cache/dev-python/colorama-0.3.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=ANSI escape character sequences for colored terminal text & cursor positioning
 EAPI=5
-HOMEPAGE=https://code.google.com/p/colorama/ https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama
+HOMEPAGE=https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama
 IUSE=examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.3.3.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=62e845b1e08453f78d9b303a8ad07530
+_md5_=eeac4fcba83d728fde4ce18b70c584d6
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.5 b/metadata/md5-cache/dev-python/colorama-0.3.5
index 26b9f006903a..b19ee1b602d0 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.5
+++ b/metadata/md5-cache/dev-python/colorama-0.3.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=ANSI escape character sequences for colored terminal text & cursor positioning
 EAPI=5
-HOMEPAGE=https://code.google.com/p/colorama/ https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama
+HOMEPAGE=https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama
 IUSE=examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.3.5.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=455fd174ba3413262eee7c8ef4929ec7
+_md5_=12f71fc8ed2524bfb32e7b41c7dc5274
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.6 b/metadata/md5-cache/dev-python/colorama-0.3.6
index 072580a42b5d..dd3f8f9c6ec0 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.6
+++ b/metadata/md5-cache/dev-python/colorama-0.3.6
@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=ANSI escape character sequences for colored terminal text & cursor positioning
-EAPI=5
-HOMEPAGE=https://code.google.com/p/colorama/ https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama
 IUSE=examples python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.3.6.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8170fa78301b40568b53a0a891d52ed7
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=e3b2ae1ff00b6096bd4c8d66c10bc8c0
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.3.1 b/metadata/md5-cache/dev-python/google-api-python-client-1.3.1
index 612edf53d48b..c8db88c45e04 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.3.1
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-gflags[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/oauth2client[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/uritemplate[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+DEPEND=dev-python/python-gflags[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] <dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/uritemplate[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Google API Client for Python
 EAPI=5
 HOMEPAGE=https://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client
 IUSE=python_targets_pypy python_targets_python2_7
 KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/python-gflags[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/oauth2client[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/uritemplate[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+RDEPEND=dev-python/python-gflags[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] <dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/simplejson[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/uritemplate[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.3.1.tar.gz -> google-api-python-client-1.3.1.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=11c1a11a698598b9f0360db1e47be195
+_md5_=c00b0ba93dde7c9e387d460ac8941533
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.4.2 b/metadata/md5-cache/dev-python/google-api-python-client-1.4.2
index f7e468f5248c..60048479b223 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.4.2
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.4.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/oauth2client[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/uritemplate[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-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_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/uritemplate[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-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_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Google API Client for Python
 EAPI=5
 HOMEPAGE=https://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/oauth2client[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/uritemplate[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-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_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/uritemplate[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-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_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.4.2.tar.gz -> google-api-python-client-1.4.2.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=2ad350b5579db9758fe2004491bb0b71
+_md5_=c8ae2b0b24cadc1d5733f5f676749b36
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.5.0 b/metadata/md5-cache/dev-python/google-api-python-client-1.5.0
new file mode 100644
index 000000000000..12aae910e92d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oauth2client-3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/uritemplate-0.6[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/uritemplate-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-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_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Google API Client for Python
+EAPI=5
+HOMEPAGE=https://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client
+IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.8[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/httplib2-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/oauth2client-3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/uritemplate-0.6[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/uritemplate-1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.6.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-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_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/google/google-api-python-client/archive/v1.5.0.tar.gz -> google-api-python-client-1.5.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=68712144c400ef89445373d435616653
diff --git a/metadata/md5-cache/dev-python/gst-python-1.6.2 b/metadata/md5-cache/dev-python/gst-python-1.6.2
index c380c10794c1..2fbea49b53b5 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.6.2
+++ b/metadata/md5-cache/dev-python/gst-python-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=A Python Interface to GStreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=test 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-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-python/pygobject-3:3[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(-)] >=media-libs/gstreamer-1.6.2:1.0[introspection] >=media-libs/gst-plugins-base-1.6.2:1.0[introspection]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-python/gst-python-1.6.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e0db590a4ab52eb7ed2bcaeb0c15eb43
+_md5_=faa6a4b5e218112085e90c4a07fee0d2
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.33 b/metadata/md5-cache/dev-python/humanfriendly-1.33
deleted file mode 100644
index ab2c2ff8f2e2..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-1.33
+++ /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_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[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=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=Human friendly output for text interfaces using Python
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=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=mirror://pypi/h/humanfriendly/humanfriendly-1.33.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=45c9fff0e7985135af2b18cdcd9ee239
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.35 b/metadata/md5-cache/dev-python/humanfriendly-1.35
deleted file mode 100644
index babb84743550..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-1.35
+++ /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_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[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=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=Human friendly output for text interfaces using Python
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=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=mirror://pypi/h/humanfriendly/humanfriendly-1.35.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=45c9fff0e7985135af2b18cdcd9ee239
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.38 b/metadata/md5-cache/dev-python/humanfriendly-1.38
deleted file mode 100644
index 39dcc02b2afd..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-1.38
+++ /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_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/capturer[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/coloredlogs[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[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=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=Human friendly output for text interfaces using Python
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) >=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=mirror://pypi/h/humanfriendly/humanfriendly-1.38.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=1a6e79955abe47150dbc1d29bbab496c
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.42 b/metadata/md5-cache/dev-python/humanfriendly-1.42
deleted file mode 100644
index cdd9d78fdf12..000000000000
--- a/metadata/md5-cache/dev-python/humanfriendly-1.42
+++ /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? ( dev-python/capturer[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(-)] dev-python/coloredlogs[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[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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=Human friendly output for text interfaces using Python
-EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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/h/humanfriendly/humanfriendly-1.42.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d4eddf47802fbf763f6f09ac4c3d6143
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.43.1 b/metadata/md5-cache/dev-python/humanfriendly-1.44.3
similarity index 97%
rename from metadata/md5-cache/dev-python/humanfriendly-1.43.1
rename to metadata/md5-cache/dev-python/humanfriendly-1.44.3
index 57a550e86ff3..c548ddbacb8e 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-1.43.1
+++ b/metadata/md5-cache/dev-python/humanfriendly-1.44.3
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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/h/humanfriendly/humanfriendly-1.43.1.tar.gz
+SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-1.44.3.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=24f88768bd9623b6072d7374750002c0
diff --git a/metadata/md5-cache/dev-python/ipyparallel-5.0.1 b/metadata/md5-cache/dev-python/ipyparallel-5.0.1
new file mode 100644
index 000000000000..d03ac524fb38
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipyparallel-5.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/ipython_genutils[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(-)] dev-python/decorator[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(-)] >=dev-python/pyzmq-14.4.0[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(-)] dev-python/ipykernel[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(-)] !<dev-python/ipython-4.0.0[smp] >=dev-python/ipython-4.0.0[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(-)] dev-python/jupyter_client[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(-)] doc? ( dev-python/sphinx[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? ( 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(-)] dev-python/requests[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[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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=Interactive Parallel Computing with IPython
+EAPI=6
+HOMEPAGE=http://ipython.org/
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/ipython_genutils[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(-)] dev-python/decorator[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(-)] >=dev-python/pyzmq-14.4.0[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(-)] dev-python/ipykernel[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(-)] !<dev-python/ipython-4.0.0[smp] >=dev-python/ipython-4.0.0[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(-)] dev-python/jupyter_client[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[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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/i/ipyparallel/ipyparallel-5.0.1.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=670e66fe42a0067945e0149ed5c3eed4
diff --git a/metadata/md5-cache/dev-python/oauth2client-2.0.0 b/metadata/md5-cache/dev-python/oauth2client-2.0.0_p1
similarity index 97%
rename from metadata/md5-cache/dev-python/oauth2client-2.0.0
rename to metadata/md5-cache/dev-python/oauth2client-2.0.0_p1
index 69c35ca2508c..bdc3076fb446 100644
--- a/metadata/md5-cache/dev-python/oauth2client-2.0.0
+++ b/metadata/md5-cache/dev-python/oauth2client-2.0.0_p1
@@ -10,6 +10,6 @@ RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/google/oauth2client/archive/v2.0.0.tar.gz -> oauth2client-2.0.0.tar.gz
+SRC_URI=https://github.com/google/oauth2client/archive/v2.0.0-post1.tar.gz -> oauth2client-2.0.0_p1.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9f8295711ca8d3ab811b7a603ffb0b2d
+_md5_=0224f746936c65dd09d7c2286ea7f01a
diff --git a/metadata/md5-cache/dev-python/packaging-16.4 b/metadata/md5-cache/dev-python/packaging-16.4
new file mode 100644
index 000000000000..51ba4b650f37
--- /dev/null
+++ b/metadata/md5-cache/dev-python/packaging-16.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare test
+DEPEND=test? ( dev-python/pretend[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3? ( virtual/pypy3: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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Core utilities for Python packages
+EAPI=6
+HOMEPAGE=https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Apache-2.0 BSD-2 )
+PDEPEND=dev-python/pyparsing[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/packaging/packaging-16.4.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=50849108cb13c02a04ec4c1637ace528
diff --git a/metadata/md5-cache/dev-python/pyGPG-0.2 b/metadata/md5-cache/dev-python/pyGPG-0.2
index 76a13709d3b3..1f04865e0fa0 100644
--- a/metadata/md5-cache/dev-python/pyGPG-0.2
+++ b/metadata/md5-cache/dev-python/pyGPG-0.2
@@ -4,11 +4,11 @@ DESCRIPTION=A python interface wrapper for gnupg's gpg command
 EAPI=5
 HOMEPAGE=https://github.com/dol-sen/pyGPG
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86
 LICENSE=BSD
 RDEPEND=app-crypt/gnupg 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=https://dev.gentoo.org/~dolsen/releases/pyGPG/pyGPG-0.2.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=08caa3cfccbc0d9c83da11696e84ae0c
+_md5_=142c0c39487a5b94656c471cc2dad846
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.18.0 b/metadata/md5-cache/dev-python/pyatspi-2.18.0
index 6aa3db6ea422..e90f4ac849c9 100644
--- a/metadata/md5-cache/dev-python/pyatspi-2.18.0
+++ b/metadata/md5-cache/dev-python/pyatspi-2.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python binding to at-spi library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=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
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2 GPL-2+
 RDEPEND=>=dev-libs/atk-2.11.2 dev-python/dbus-python[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(-)] >=dev-python/pygobject-2.90.1:3[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(-)] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.18.0[introspection] !<gnome-extra/at-spi-1.32.0-r1
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pyatspi/2.18/pyatspi-2.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=95b818ee7c3d2323643cd3ad83c199ae
+_md5_=259adcde6b842238a56c82f87df835f9
diff --git a/metadata/md5-cache/dev-python/pychroot-9999 b/metadata/md5-cache/dev-python/pychroot-9999
index 8ae90973b479..8d923fc90cef 100644
--- a/metadata/md5-cache/dev-python/pychroot-9999
+++ b/metadata/md5-cache/dev-python/pychroot-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-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(-)] =dev-python/snakeoil-9999[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-python/3to2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[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(-)] ) dev-python/sphinx[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(-)] >=dev-vcs/git-1.8.2.1
+DEPEND==dev-python/snakeoil-9999[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(-)] 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? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[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(-)] ) dev-python/sphinx[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(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=a python library and cli tool that simplify chroot handling
 EAPI=5
 HOMEPAGE=https://github.com/pkgcore/pychroot
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 LICENSE=BSD
-RDEPEND=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(-)] =dev-python/snakeoil-9999[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(-)]
+RDEPEND==dev-python/snakeoil-9999[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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8f14b3559d52916120f40dd74eff8385
+_md5_=8aa15505f8353e75f87589d70c3ec240
diff --git a/metadata/md5-cache/dev-python/pygobject-3.18.2 b/metadata/md5-cache/dev-python/pygobject-3.18.2
index 49963315def0..82573c105a51 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.18.2
+++ b/metadata/md5-cache/dev-python/pygobject-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/PyGObject
 IUSE=+cairo examples test +threads python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 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(-)] >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[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(-)] x11-libs/cairo ) !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) test? ( cairo )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.18/pygobject-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d15c490a4a706ba755f92b588f5aa4cb
+_md5_=c48620785d5548894d38f1cd13419429
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r1 b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
index 1719aa20bf0b..2fb6ad765a47 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r1
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python wrapper for the GPGME library
 EAPI=5
 HOMEPAGE=https://launchpad.net/pygpgme
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-crypt/gpgme 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=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=2619764f3dd16dd5c3fcae9bbee65260
+_md5_=b5229ae5ba5a81e88df44bc2a82bdca0
diff --git a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0 b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0
new file mode 100644
index 000000000000..def26df83c6f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyopengl[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/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=Accelerate module for PyOpenGL
+EAPI=5
+HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.python.org/pypi/PyOpenGL-accelerate
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~x86 ~amd64 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/pyopengl[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=mirror://pypi/P/PyOpenGL-accelerate/PyOpenGL-accelerate-3.1.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=fab09229274758e96d56902e1a1fe09f
diff --git a/metadata/md5-cache/dev-python/python-efl-1.17.0 b/metadata/md5-cache/dev-python/python-efl-1.17.0
new file mode 100644
index 000000000000..9f77c807f0a2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-efl-1.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/efl-1.17.0 >=media-libs/elementary-1.17.0 >dev-python/dbus-python-0.83[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/pkgconfig dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cython-0.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( media-gfx/graphviz[python] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( >dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python bindings for Enlightenment Fundation Libraries
+EAPI=5
+HOMEPAGE=http://www.enlightenment.org
+IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=>=dev-libs/efl-1.17.0 >=media-libs/elementary-1.17.0 >dev-python/dbus-python-0.83[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.17.0.tar.xz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=b7b6305d2adcc339c8cc650a3c91f072
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.2.0 b/metadata/md5-cache/dev-python/qtconsole-4.2.0
new file mode 100644
index 000000000000..98f21cc72f75
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qtconsole-4.2.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/ipykernel[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(-)] >=dev-python/jupyter_client-4.1.1[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(-)] doc? ( >=dev-python/ipython-4.0.0-r2[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(-)] >=dev-python/sphinx-1.3.1-r1[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? ( >=dev-python/nose-0.10.1[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(-)] ) || ( dev-python/pyside[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(-),svg] dev-python/PyQt4[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(-),svg] dev-python/PyQt5[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(-),svg] ) dev-python/pygments[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(-)] >=dev-python/pyzmq-13[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[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Qt-based console for Jupyter with support for rich media output
+EAPI=6
+HOMEPAGE=http://jupyter.org
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+PDEPEND=dev-python/ipython[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(-)]
+RDEPEND=dev-python/ipykernel[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(-)] >=dev-python/jupyter_client-4.1.1[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[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=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/q/qtconsole/qtconsole-4.2.0.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=6f74c3ab5f570cb3228fc4a94d6ea45b
diff --git a/metadata/md5-cache/dev-python/spyder-2.3.8 b/metadata/md5-cache/dev-python/spyder-2.3.8
new file mode 100644
index 000000000000..86b316851eec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-2.3.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( dev-python/PyQt4[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(-),svg,webkit] dev-python/pyside[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(-),svg,webkit] ) ipython? ( dev-python/ipython[qt4,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(-)] ) qtconsole? ( dev-python/qtconsole[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(-)] ) matplotlib? ( dev-python/matplotlib[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(-)] ) numpy? ( dev-python/numpy[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(-)] ) pep8? ( dev-python/pep8[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(-)] ) pyflakes? ( >=dev-python/pyflakes-0.5[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(-)] ) pylint? ( dev-python/pylint[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(-)] ) rope? ( python_targets_python2_7? ( dev-python/rope[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) scipy? ( sci-libs/scipy[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(-)] ) sphinx? ( >=dev-python/sphinx-0.6.0[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(-)] ) app-arch/unzip doc? ( >=dev-python/sphinx-0.6.0[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=Python IDE with matlab-like features
+EAPI=6
+HOMEPAGE=https://github.com/spyder-ide/spyder
+IUSE=doc ipython matplotlib numpy pep8 +pyflakes pylint qtconsole +rope scipy sphinx python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( dev-python/PyQt4[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(-),svg,webkit] dev-python/pyside[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(-),svg,webkit] ) ipython? ( dev-python/ipython[qt4,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(-)] ) qtconsole? ( dev-python/qtconsole[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(-)] ) matplotlib? ( dev-python/matplotlib[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(-)] ) numpy? ( dev-python/numpy[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(-)] ) pep8? ( dev-python/pep8[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(-)] ) pyflakes? ( >=dev-python/pyflakes-0.5[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(-)] ) pylint? ( dev-python/pylint[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(-)] ) rope? ( python_targets_python2_7? ( dev-python/rope[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) scipy? ( sci-libs/scipy[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(-)] ) sphinx? ( >=dev-python/sphinx-0.6.0[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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://bitbucket.org/spyder-ide/spyderlib/downloads/spyder-2.3.8.zip
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=28febc949031a195799d4830bec291d9
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.4 b/metadata/md5-cache/dev-python/ssl-fetch-0.4
index c3917a1cb442..914344815305 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-0.4
+++ b/metadata/md5-cache/dev-python/ssl-fetch-0.4
@@ -4,11 +4,11 @@ DESCRIPTION=A small convenience library for fetching files securely
 EAPI=5
 HOMEPAGE=https://github.com/dol-sen/ssl-fetch
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-python/requests-1.2.1[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_python2_7? ( dev-python/ndg-httpsclient[python_targets_python2_7] dev-python/pyasn1[python_targets_python2_7] >=dev-python/pyopenssl-0.13[python_targets_python2_7] ) 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=https://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.4.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3436e8e451567cf9d412bf89408007b5
+_md5_=00a514e83eb74ca3bbb9ae85f570c31b
diff --git a/metadata/md5-cache/dev-python/twitter-1.14.3 b/metadata/md5-cache/dev-python/twitter-1.14.3
deleted file mode 100644
index d2984df0c956..000000000000
--- a/metadata/md5-cache/dev-python/twitter-1.14.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] 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(-)]
-DESCRIPTION=An API and command-line toolset for Twitter (twitter.com)
-EAPI=5
-HOMEPAGE=http://mike.verdone.ca/twitter/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=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 )
-SLOT=0
-SRC_URI=mirror://pypi/t/twitter/twitter-1.14.3.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=1c90ef65aacea627f2def0cc7c21316f
diff --git a/metadata/md5-cache/dev-python/twitter-1.15.0 b/metadata/md5-cache/dev-python/twitter-1.15.0
deleted file mode 100644
index 5c256b5af086..000000000000
--- a/metadata/md5-cache/dev-python/twitter-1.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] 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(-)]
-DESCRIPTION=An API and command-line toolset for Twitter (twitter.com)
-EAPI=5
-HOMEPAGE=http://mike.verdone.ca/twitter/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=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 )
-SLOT=0
-SRC_URI=mirror://pypi/t/twitter/twitter-1.15.0.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=01ab78f84e42e30fe4432f088e68e41f
diff --git a/metadata/md5-cache/dev-python/twitter-1.16.0 b/metadata/md5-cache/dev-python/twitter-1.16.0
deleted file mode 100644
index 1f5f7f6b07f7..000000000000
--- a/metadata/md5-cache/dev-python/twitter-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] 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(-)]
-DESCRIPTION=An API and command-line toolset for Twitter (twitter.com)
-EAPI=5
-HOMEPAGE=http://mike.verdone.ca/twitter/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=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 )
-SLOT=0
-SRC_URI=mirror://pypi/t/twitter/twitter-1.16.0.tar.gz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=1c90ef65aacea627f2def0cc7c21316f
diff --git a/metadata/md5-cache/dev-python/twitter-1.17.0 b/metadata/md5-cache/dev-python/twitter-1.17.0
index ed23d75844c9..6205f4fc91f9 100644
--- a/metadata/md5-cache/dev-python/twitter-1.17.0
+++ b/metadata/md5-cache/dev-python/twitter-1.17.0
@@ -4,11 +4,11 @@ DESCRIPTION=An API and command-line toolset for Twitter (twitter.com)
 EAPI=5
 HOMEPAGE=http://mike.verdone.ca/twitter/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=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 )
 SLOT=0
 SRC_URI=mirror://pypi/t/twitter/twitter-1.17.0.tar.gz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=1c90ef65aacea627f2def0cc7c21316f
+_md5_=8021a9bead0b020650ffe70f607b6b95
diff --git a/metadata/md5-cache/dev-python/wcsaxes-0.6 b/metadata/md5-cache/dev-python/wcsaxes-0.6
new file mode 100644
index 000000000000..1152b6e8c0d5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wcsaxes-0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Framework for plotting astronomical and geospatial data
+EAPI=6
+HOMEPAGE=http://wcsaxes.readthedocs.org
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/w/wcsaxes/wcsaxes-0.6.tar.gz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=bbe1f7692237a8825db3af229d8f8c45
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2 b/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2
index bf570ead9ecf..7eac7bdfce0a 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/dbf[ruby_targets_ruby19] dev-ruby/nokogi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/georuby-2.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ee90218d44fddf5caf5c4f7ed71b83e
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r3 b/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r3
index 5b5e9eaed172..55fbb4592220 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r3
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/dbf[ruby_targets_ruby19] dev-ruby/nokogi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/georuby-2.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a936bd91d339dea8573ad44c32e100d
diff --git a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2 b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
index 4ebf5f24324f..2e0702308d59 100644
--- a/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
+++ b/metadata/md5-cache/dev-ruby/GeoRuby-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/georuby-2.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d0a01c299302512b97ea7651d35f352c
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
index fb3735b8bba5..95c18640a1e6 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62e2b486cefd49d49bb73fb47302b87a
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3-r1 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3-r1
index 9c0e0d7163b2..6aa76878a2ab 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.3-r1
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33b110536249598f9647da77b6e40f17
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.4 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
index 372ec1b24f40..271dc15844d5 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33b110536249598f9647da77b6e40f17
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
index eba384d2d004..ca95053e712d 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e44264786ad612babf6d07ce0f21fb5f
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index adcc270611c5..2c543736dfad 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=222ba0b5c8887e82cb3a991061e4a163
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-3.2.22.1 b/metadata/md5-cache/dev-ruby/actionmailer-3.2.22.1
index 44310f5508bd..ce80a6e57d53 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-3.2.22.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-3.2.22.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-3.2.22.1[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=https://github.com/rails/rails/archive/v3.2.22.1.tar.gz -> rails-3.2.22.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be0011e37629d95c3fc717d528d091f3
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.0.13 b/metadata/md5-cache/dev-ruby/actionmailer-4.0.13
index 176b6e072311..6e6483e138ef 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.0.13
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionpack-4.0.13[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d228683cbf2b321be459352a0f73cfbe
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.1.14.1 b/metadata/md5-cache/dev-ruby/actionmailer-4.1.14.1
index 28dcbd4f6a32..648c62d8c9f7 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.1.14.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.1.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/actionpack-4.1.14.1[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.14.1.tar.gz -> rails-4.1.14.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cba9d696494292943e88944f1ab9fbeb
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-4.2.5.1 b/metadata/md5-cache/dev-ruby/actionmailer-4.2.5.1
index a166c06aee5c..ffcc858090cf 100644
--- a/metadata/md5-cache/dev-ruby/actionmailer-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/actionmailer-4.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/actionpack-4.2.5.1[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.5.1.tar.gz -> rails-4.2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6e731810711b89bd4b8ecca438e20a9
diff --git a/metadata/md5-cache/dev-ruby/actionpack-3.2.22.1 b/metadata/md5-cache/dev-ruby/actionpack-3.2.22.1
index 989cbbd3d1ca..c31ee2ed319e 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-3.2.22.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-3.2.22.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activemodel-3.2.22.1[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=https://github.com/rails/rails/archive/v3.2.22.1.tar.gz -> rails-3.2.22.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0590e4c503f68d45fdb169ec02a6683f
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.0.13 b/metadata/md5-cache/dev-ruby/actionpack-4.0.13
index 48b3fd7ffe37..370ec5b34de0 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.0.13
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.13[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85523df48ed4520e12e2feec76487b30
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.1.14.1 b/metadata/md5-cache/dev-ruby/actionpack-4.1.14.1
index a18a5b85deda..19fb745da8d7 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.1.14.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.1.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.14.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.14.1.tar.gz -> rails-4.1.14.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff87702e44fd3cf4c3177ac658caf795
diff --git a/metadata/md5-cache/dev-ruby/actionpack-4.2.5.1 b/metadata/md5-cache/dev-ruby/actionpack-4.2.5.1
index 53423201ef93..91f7a38f61fe 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-4.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.5.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.5.1.tar.gz -> rails-4.2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2810d608cef086d8b02f07f7c47a6180
diff --git a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1 b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
index 151b60f2879a..32fa5469dcc4 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
+++ b/metadata/md5-cache/dev-ruby/actionpack-action_caching-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-4.0.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/actionpack-action_caching-1.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=228facae91bd8f51b9ead155eb9c07cd
diff --git a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2 b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
index 2f4004452875..b2922075461d 100644
--- a/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
+++ b/metadata/md5-cache/dev-ruby/actionpack-xml_parser-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-4.0.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rails/actionpack-xml_parser/archive/v1.0.2.tar.gz -> actionpack-xml_parser-1.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42ead31289a940360246bc858a96fc81
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.1.14.1 b/metadata/md5-cache/dev-ruby/actionview-4.1.14.1
index 7959466afc05..9840b7b7b3fb 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.1.14.1
+++ b/metadata/md5-cache/dev-ruby/actionview-4.1.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.14.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.14.1.tar.gz -> rails-4.1.14.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e6ffb77e11be33cfa5996a000a674b8
diff --git a/metadata/md5-cache/dev-ruby/actionview-4.2.5.1 b/metadata/md5-cache/dev-ruby/actionview-4.2.5.1
index ba96fcb76c71..6796f77b4628 100644
--- a/metadata/md5-cache/dev-ruby/actionview-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/actionview-4.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.5.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.5.1.tar.gz -> rails-4.2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c83240e26c2a7f1220ce93e339e233c
diff --git a/metadata/md5-cache/dev-ruby/activejob-4.2.5.1 b/metadata/md5-cache/dev-ruby/activejob-4.2.5.1
index 14d4b7986f19..047ab2f4c603 100644
--- a/metadata/md5-cache/dev-ruby/activejob-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/activejob-4.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.5.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.5.1.tar.gz -> rails-4.2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0983867b5f4dae99a368b690dc57a1ec
diff --git a/metadata/md5-cache/dev-ruby/activeldap-3.2.2 b/metadata/md5-cache/dev-ruby/activeldap-3.2.2
index b08511da1f30..5f91b1c1ad14 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-3.2.2
+++ b/metadata/md5-cache/dev-ruby/activeldap-3.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=3
 SRC_URI=mirror://rubygems/activeldap-3.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=209a22405a9c9dd6073c9e1d4c80262c
diff --git a/metadata/md5-cache/dev-ruby/activeldap-4.0.4-r1 b/metadata/md5-cache/dev-ruby/activeldap-4.0.4-r1
index b3fb66f87889..e84090c8681b 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-4.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/activeldap-4.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://rubygems/activeldap-4.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=870e2ac4b05b772481fa57a69203f245
diff --git a/metadata/md5-cache/dev-ruby/activeldap-4.0.5 b/metadata/md5-cache/dev-ruby/activeldap-4.0.5
index d125858299e7..1315851e2321 100644
--- a/metadata/md5-cache/dev-ruby/activeldap-4.0.5
+++ b/metadata/md5-cache/dev-ruby/activeldap-4.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://rubygems/activeldap-4.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2ccdc17553f96de074b7e8dae79d146c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-3.2.22.1 b/metadata/md5-cache/dev-ruby/activemodel-3.2.22.1
index 32d02599612d..36755ea1c726 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-3.2.22.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-3.2.22.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.22.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=https://github.com/rails/rails/archive/v3.2.22.1.tar.gz -> rails-3.2.22.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0185a7e0261f2e50c8343f77e1a581c
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.0.13 b/metadata/md5-cache/dev-ruby/activemodel-4.0.13
index 04d192befc25..501f324ab73c 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.0.13
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.13[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9b736cca83278e31d99d71590ef8dc8
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.1.14.1 b/metadata/md5-cache/dev-ruby/activemodel-4.1.14.1
index 8c84b2b73060..5c28a859084e 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.1.14.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.1.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.14.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.14.1.tar.gz -> rails-4.1.14.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=482aa3a54fb3c713d73dd0a9328ae8f0
diff --git a/metadata/md5-cache/dev-ruby/activemodel-4.2.5.1 b/metadata/md5-cache/dev-ruby/activemodel-4.2.5.1
index 5c585b14168c..797e9da795ac 100644
--- a/metadata/md5-cache/dev-ruby/activemodel-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/activemodel-4.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.5.1:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.5.1.tar.gz -> rails-4.2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d610e36fb90926f1ea9bcecc33dca187
diff --git a/metadata/md5-cache/dev-ruby/activerecord-3.2.22.1 b/metadata/md5-cache/dev-ruby/activerecord-3.2.22.1
index 8a193aa12f89..19d1ad4cd0ad 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-3.2.22.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-3.2.22.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.22.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=https://github.com/rails/rails/archive/v3.2.22.1.tar.gz -> rails-3.2.22.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fbcdab01b2844a9cd0e7429b55a88e21
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.0.13 b/metadata/md5-cache/dev-ruby/activerecord-4.0.13
index 9b43bc3f2e6c..26b67b475539 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.0.13
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.0.13[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff56b91a9dd5f419ceeb80a67fb4d7a5
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.1.14.1 b/metadata/md5-cache/dev-ruby/activerecord-4.1.14.1
index 8d367434f789..0891eb398d88 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.1.14.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.1.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.14.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.14.1.tar.gz -> rails-4.1.14.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ebcc2b755b3962b35319371f857bb061
diff --git a/metadata/md5-cache/dev-ruby/activerecord-4.2.5.1 b/metadata/md5-cache/dev-ruby/activerecord-4.2.5.1
index 14dd53dfc1c7..f13a04f8ba10 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/activerecord-4.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.5.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.5.1.tar.gz -> rails-4.2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=daed8a99a1098dec932d560eb7b24049
diff --git a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4 b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
index e425e6aa839f..44ccc2f4d5de 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activerecord-deprecated_finders/archive/v1.0.4.tar.gz -> activerecord-deprecated_finders-1.0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed90f2c1d341a644efed0e6b63b1f744
diff --git a/metadata/md5-cache/dev-ruby/activeresource-3.2.22.1 b/metadata/md5-cache/dev-ruby/activeresource-3.2.22.1
index ef0881eb86e0..08b0f5f59d7a 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-3.2.22.1
+++ b/metadata/md5-cache/dev-ruby/activeresource-3.2.22.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/activesupport-3.2.22.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=https://github.com/rails/rails/archive/v3.2.22.1.tar.gz -> rails-3.2.22.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=72bf57927837b94f102fc380654389af
diff --git a/metadata/md5-cache/dev-ruby/activeresource-4.0.0 b/metadata/md5-cache/dev-ruby/activeresource-4.0.0
index 0d4794cb2947..fceb635cdaa1 100644
--- a/metadata/md5-cache/dev-ruby/activeresource-4.0.0
+++ b/metadata/md5-cache/dev-ruby/activeresource-4.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/activesupport-4*[ruby_targets_ruby19] =
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/activeresource/archive/v4.0.0.tar.gz -> activeresource-4.0.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cb3b5ff9f5693ca115ec3b86dced4db0
diff --git a/metadata/md5-cache/dev-ruby/activesupport-3.2.22.1 b/metadata/md5-cache/dev-ruby/activesupport-3.2.22.1
index 8d7752893a0a..24e6709c1347 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-3.2.22.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-3.2.22.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=https://github.com/rails/rails/archive/v3.2.22.1.tar.gz -> rails-3.2.22.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=252bd53ae137968a9a356861ea9c8484
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.0.13-r1 b/metadata/md5-cache/dev-ruby/activesupport-4.0.13-r1
index df3a7cafce9c..96e58ff30af6 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.0.13-r1
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.0.13-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d642cfbc13e118ca6735486413c9beb
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.1.14.1 b/metadata/md5-cache/dev-ruby/activesupport-4.1.14.1
index 705bc5c08e7a..067c4fb07324 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.1.14.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.1.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby20] >=
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.14.1.tar.gz -> rails-4.1.14.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=daf4af649c7b401157687a0a1cebb8ef
diff --git a/metadata/md5-cache/dev-ruby/activesupport-4.2.5.1 b/metadata/md5-cache/dev-ruby/activesupport-4.2.5.1
index d097b12c8067..dfbe9920531a 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/activesupport-4.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/i18n-0.7:0.7[ruby_targets_ruby20] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.5.1.tar.gz -> rails-4.2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=106d76214ed0f68408d574455ec843c0
diff --git a/metadata/md5-cache/dev-ruby/acts_as_list-0.7.2 b/metadata/md5-cache/dev-ruby/acts_as_list-0.7.2
index 9c3275a532c1..7ee75800499b 100644
--- a/metadata/md5-cache/dev-ruby/acts_as_list-0.7.2
+++ b/metadata/md5-cache/dev-ruby/acts_as_list-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/acts_as_list-0.7.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5ce2c7932c9807e2663f077654ed5ca
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.3.6 b/metadata/md5-cache/dev-ruby/addressable-2.3.6
index 86532914d8ae..269cddb74695 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.3.6
+++ b/metadata/md5-cache/dev-ruby/addressable-2.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.3.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=247911ffa466aa8dc29e29e87183d6ef
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.3.8 b/metadata/md5-cache/dev-ruby/addressable-2.3.8
index 55cb1091be40..f19b9b63cac4 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.3.8
+++ b/metadata/md5-cache/dev-ruby/addressable-2.3.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.3.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad725f02827b6ed44ca66662ebbf6e52
diff --git a/metadata/md5-cache/dev-ruby/addressable-2.4.0 b/metadata/md5-cache/dev-ruby/addressable-2.4.0
index f23a9d0d4cf5..7f2c099a6e5f 100644
--- a/metadata/md5-cache/dev-ruby/addressable-2.4.0
+++ b/metadata/md5-cache/dev-ruby/addressable-2.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/addressable-2.4.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b9e0de2642b47f46c0f41447dfd1e6f
diff --git a/metadata/md5-cache/dev-ruby/ae-1.8.2 b/metadata/md5-cache/dev-ruby/ae-1.8.2
index eb285fdc01fa..cfb59fb7c2fe 100644
--- a/metadata/md5-cache/dev-ruby/ae-1.8.2
+++ b/metadata/md5-cache/dev-ruby/ae-1.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ae-1.8.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=13fb7904f99ee1a9032e147a9b35b177
diff --git a/metadata/md5-cache/dev-ruby/afm-0.2.2 b/metadata/md5-cache/dev-ruby/afm-0.2.2
index 3204aaa110ac..192ed6c88600 100644
--- a/metadata/md5-cache/dev-ruby/afm-0.2.2
+++ b/metadata/md5-cache/dev-ruby/afm-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/afm-0.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99bb4191f8829ff4270a0ba774a95dd5
diff --git a/metadata/md5-cache/dev-ruby/akismet-1.0.2 b/metadata/md5-cache/dev-ruby/akismet-1.0.2
index 082dd53737ad..a09ee0c18c21 100644
--- a/metadata/md5-cache/dev-ruby/akismet-1.0.2
+++ b/metadata/md5-cache/dev-ruby/akismet-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jonahb/akismet/archive/v1.0.2.tar.gz -> akismet-1.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=876030eaf47d8fcbe732d2ddfcfd4b42
diff --git a/metadata/md5-cache/dev-ruby/akismet-2.0.0 b/metadata/md5-cache/dev-ruby/akismet-2.0.0
index 9b4030ae7f0c..51e89b543c79 100644
--- a/metadata/md5-cache/dev-ruby/akismet-2.0.0
+++ b/metadata/md5-cache/dev-ruby/akismet-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/jonahb/akismet/archive/v2.0.0.tar.gz -> akismet-2.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e748c2632743115da6d2b735bb58ad7a
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r2 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
index a5e05ad0ad90..466c5f9a23bb 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9f17010ec8a63ecc61f05a11211c190
diff --git a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3 b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
index 64fc8ac2b855..3b0dac077358 100644
--- a/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
+++ b/metadata/md5-cache/dev-ruby/allison-2.0.3-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/allison-2.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7bf8ac27961f88f13d72fe196654597c
diff --git a/metadata/md5-cache/dev-ruby/amatch-0.3.0 b/metadata/md5-cache/dev-ruby/amatch-0.3.0
index 4eb3936ae838..65c100991a2b 100644
--- a/metadata/md5-cache/dev-ruby/amatch-0.3.0
+++ b/metadata/md5-cache/dev-ruby/amatch-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/tins-0.3[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/amatch-0.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=097dd6239fcf98c59b71a5f9879211f5
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.2 b/metadata/md5-cache/dev-ruby/ammeter-1.1.2
index 12ae7404b5be..2afc8eb93b23 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.2
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-1.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5772f98b7ecb217fc6a637e2166ae0da
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.3 b/metadata/md5-cache/dev-ruby/ammeter-1.1.3
index c0ac82e3a766..517acc6c1ea8 100644
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.3
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ammeter-1.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73551760f6c9a70e7243e59671b09d8a
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.4 b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
index 20774887bcb8..c48036c8239d 100644
--- a/metadata/md5-cache/dev-ruby/amq-client-1.0.4
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/amq-client-1.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b23a24aad19ceb1219bcb817c95d902b
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2 b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
index 2c426ab45d94..14f301541264 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/amq-protocol-1.9.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=959a7439fed973b10e214e38262c042a
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.0.0 b/metadata/md5-cache/dev-ruby/amq-protocol-2.0.0
index 6d8a3065f1eb..d5cab59fce7f 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.0.0
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/amq-protocol-2.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c1ee56ba8ca72ca9c79050973f1a1c6
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.0.1 b/metadata/md5-cache/dev-ruby/amq-protocol-2.0.1
index 8fd44b31c990..35f100376f13 100644
--- a/metadata/md5-cache/dev-ruby/amq-protocol-2.0.1
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/amq-protocol-2.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5f2326555ee429b07443d3afbd9c52a
diff --git a/metadata/md5-cache/dev-ruby/amqp-1.5.1 b/metadata/md5-cache/dev-ruby/amqp-1.5.1
index 9d9bd237473f..2e3f145e69c4 100644
--- a/metadata/md5-cache/dev-ruby/amqp-1.5.1
+++ b/metadata/md5-cache/dev-ruby/amqp-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/amqp-1.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=24539cc2938910b8dcd08e742411a74e
diff --git a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1 b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
index c1ddf27d2759..5bf5a0d47fa5 100644
--- a/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
+++ b/metadata/md5-cache/dev-ruby/annoy-0.5.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/annoy-0.5.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fa9dc07e748ad941e9d4d9b9756bc762
diff --git a/metadata/md5-cache/dev-ruby/ansi-1.5.0 b/metadata/md5-cache/dev-ruby/ansi-1.5.0
index 01e4cde08249..cf1db8478f67 100644
--- a/metadata/md5-cache/dev-ruby/ansi-1.5.0
+++ b/metadata/md5-cache/dev-ruby/ansi-1.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ansi-1.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=51e0e7e31678829ec2b012d4d76bbc3f
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r1 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r1
index dfb7c451856a..f7a967c97928 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r1
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitar-0.5.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92ef768d8aacd141c5df1f1229225ab5
diff --git a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r2 b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r2
index 31d98d90430b..b9e78d60e6db 100644
--- a/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r2
+++ b/metadata/md5-cache/dev-ruby/archive-tar-minitar-0.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitar-0.5.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0c438369c16b74fc141ca968b6078a3
diff --git a/metadata/md5-cache/dev-ruby/arel-3.0.3 b/metadata/md5-cache/dev-ruby/arel-3.0.3
index aa1639ab10f8..80250905dfaa 100644
--- a/metadata/md5-cache/dev-ruby/arel-3.0.3
+++ b/metadata/md5-cache/dev-ruby/arel-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3.0
 SRC_URI=mirror://rubygems/arel-3.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d43e77d4253b591bf9e7d483807a6ba1
diff --git a/metadata/md5-cache/dev-ruby/arel-4.0.2 b/metadata/md5-cache/dev-ruby/arel-4.0.2
index 6824de003833..7287547eca34 100644
--- a/metadata/md5-cache/dev-ruby/arel-4.0.2
+++ b/metadata/md5-cache/dev-ruby/arel-4.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/arel-4.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e505fbc58865e7cc90925a9e4f62785
diff --git a/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214 b/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
index 483aa4ba1192..6c5d7b9cfc9c 100644
--- a/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
+++ b/metadata/md5-cache/dev-ruby/arel-5.0.1.20140414130214
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5.0
 SRC_URI=mirror://rubygems/arel-5.0.1.20140414130214.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3019c00cf82c0e795b4de8f2718bed73
diff --git a/metadata/md5-cache/dev-ruby/arel-6.0.2 b/metadata/md5-cache/dev-ruby/arel-6.0.2
index 66e65a7a22e5..47e45488373a 100644
--- a/metadata/md5-cache/dev-ruby/arel-6.0.2
+++ b/metadata/md5-cache/dev-ruby/arel-6.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/arel/archive/v6.0.2.tar.gz -> arel-6.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a69aecef9c071a34f937ef23ec310083
diff --git a/metadata/md5-cache/dev-ruby/arel-6.0.3 b/metadata/md5-cache/dev-ruby/arel-6.0.3
index 8229d80f5930..1175bb6fa585 100644
--- a/metadata/md5-cache/dev-ruby/arel-6.0.3
+++ b/metadata/md5-cache/dev-ruby/arel-6.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=6.0
 SRC_URI=https://github.com/rails/arel/archive/v6.0.3.tar.gz -> arel-6.0.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ecab088f2e9007d6f2d87b35cc3166b4
diff --git a/metadata/md5-cache/dev-ruby/arel-7.0.0 b/metadata/md5-cache/dev-ruby/arel-7.0.0
index 4d829d853c16..860581df6f35 100644
--- a/metadata/md5-cache/dev-ruby/arel-7.0.0
+++ b/metadata/md5-cache/dev-ruby/arel-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=7.0
 SRC_URI=https://github.com/rails/arel/archive/v7.0.0.tar.gz -> arel-7.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99363184fd9f0c9da6ce37057f8ccf0a
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.1.1 b/metadata/md5-cache/dev-ruby/arel-helpers-2.1.1
index 689aa48f9999..498f6cdc760a 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.1.1
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( || ( dev-ruby/activerecord:3.2[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/arel-helpers-2.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b68a172157541a65551a09780a67a31
diff --git a/metadata/md5-cache/dev-ruby/arel-helpers-2.2.0 b/metadata/md5-cache/dev-ruby/arel-helpers-2.2.0
index 6819a29b759b..3222be550eee 100644
--- a/metadata/md5-cache/dev-ruby/arel-helpers-2.2.0
+++ b/metadata/md5-cache/dev-ruby/arel-helpers-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( || ( dev-ruby/activerecord:3.2[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/arel-helpers-2.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93e888d455442e69e912d88db23d0d2c
diff --git a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2 b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
index 4ff1508007f7..493fe93ba11f 100644
--- a/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/ascii85-1.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/Ascii85-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af37d2fefe06105bf0e495492ba8ca15
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.2 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.2
index 8634b7edfb03..0591c05617af 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.2
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.2.tar.gz -> asciidoctor-1.5.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40fbbb18538bf7a6052f1fafeff1a524
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.3 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.3
index 051ae282e139..a2a89561a011 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.3
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.3.tar.gz -> asciidoctor-1.5.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7f28989ef6ca8cb2ccd8cb7d8efe259
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4 b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
index 7175c08debcc..947de162c28f 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v1.5.4.tar.gz -> asciidoctor-1.5.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7537bac787353275f220ac6c9b22ef99
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.2 b/metadata/md5-cache/dev-ruby/asciimath-1.0.2
index b860554e00e3..ace783457653 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.2
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/asciimath-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d492a89bfc32425074d4b2f4816eb555
diff --git a/metadata/md5-cache/dev-ruby/ast-2.2.0 b/metadata/md5-cache/dev-ruby/ast-2.2.0
index 728da31f188f..3009b3d85961 100644
--- a/metadata/md5-cache/dev-ruby/ast-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ast-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ast-2.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be861d2f720106ac33f347c615c97545
diff --git a/metadata/md5-cache/dev-ruby/astrolabe-1.3.0 b/metadata/md5-cache/dev-ruby/astrolabe-1.3.0
index 85c0a4a67fbc..bacf8560bf80 100644
--- a/metadata/md5-cache/dev-ruby/astrolabe-1.3.0
+++ b/metadata/md5-cache/dev-ruby/astrolabe-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/astrolabe-1.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cc263a6e1e090cbe1a35e8f28f74688
diff --git a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1 b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
index e928736da037..9f5a89194b43 100644
--- a/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
+++ b/metadata/md5-cache/dev-ruby/astrolabe-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/parser-2.2.0_pre3[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/astrolabe-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cc263a6e1e090cbe1a35e8f28f74688
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.2.0 b/metadata/md5-cache/dev-ruby/async_sinatra-1.2.0
index 3fbb90898d49..6510f6493b3f 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.2.0
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.2.0.tar.gz -> async_sinatra-1.2.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=972ceb264236acbdcb458b132b3f0106
diff --git a/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1 b/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
index 7d34a208bbdf..50f85f2003c4 100644
--- a/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
+++ b/metadata/md5-cache/dev-ruby/async_sinatra-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/sinatra-1.3.2[ruby_targets_ruby20] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/raggi/async_sinatra/archive/v1.2.1.tar.gz -> async_sinatra-1.2.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c01cd79206aea9af1d30e23711c3b2d
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.16 b/metadata/md5-cache/dev-ruby/atomic-1.1.16
index 99657b4b8aca..2f7bc7df5ff9 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.16
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.16
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.16.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c5f3e64bd3db0bb1dbe2d702da00ae8e
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.99 b/metadata/md5-cache/dev-ruby/atomic-1.1.99
index cf81ac599bb4..7e4a57d0890e 100644
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.99
+++ b/metadata/md5-cache/dev-ruby/atomic-1.1.99
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/atomic-1.1.99.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=25ad3a057981b14eb2c5104b0fef749a
diff --git a/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2 b/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
index f79bdf9c5fcb..6381fde9eff9 100644
--- a/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/awesome_print-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/awesome_print-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1540a5bfd1dbf59c3813397666830a5d
diff --git a/metadata/md5-cache/dev-ruby/awesome_print-1.6.1 b/metadata/md5-cache/dev-ruby/awesome_print-1.6.1
index 0ff2d17403e2..6bc865cc8fa4 100644
--- a/metadata/md5-cache/dev-ruby/awesome_print-1.6.1
+++ b/metadata/md5-cache/dev-ruby/awesome_print-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/awesome_print-1.6.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6bdf2d7fbfaea25a64b2e2e0f828cc5
diff --git a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3 b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
index 143e388cd64f..559826102375 100644
--- a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
+++ b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/xml-simple[ruby_targets_ruby19] dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/aws-s3-0.6.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=056fc6fa91d0892e8cfcc891956023cb
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0 b/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
index 2c465ab1b171..58a693b2a2d8 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-1.66.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v1.66.0.tar.gz -> aws-sdk-ruby-1.66.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a3d0eb380757db686800ffdfb4a7536
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.2.18 b/metadata/md5-cache/dev-ruby/aws-sdk-2.2.18
index bc28afc84441..2ec5fcc8ad4b 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.2.18
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.2.18
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ~dev-ruby/a
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.2.18.tar.gz -> aws-sdk-ruby-2.2.18.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5a0b5dbd05abaabfffa034a740660e1
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-2.2.5 b/metadata/md5-cache/dev-ruby/aws-sdk-2.2.5
index 5eec418d02f5..fd2a43d325a4 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-2.2.5
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ~dev-ruby/a
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.2.5.tar.gz -> aws-sdk-ruby-2.2.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5a0b5dbd05abaabfffa034a740660e1
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.2.18 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.2.18
index 6848f90907f2..d478e8e2e5d2 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.2.18
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.2.18
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/jmespath:1[ruby_targets_ruby20] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.2.18.tar.gz -> aws-sdk-ruby-2.2.18.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84b3f84813e7ee4be7ea965bd491bc6
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.2.5 b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.2.5
index 81aae3c793fc..3edb1bc7b961 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-core-2.2.5
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-core-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/jmespath:1[ruby_targets_ruby20] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.2.5.tar.gz -> aws-sdk-ruby-2.2.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=66bd5700a360529527fa1b80ee4c8a3e
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.2.18 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.2.18
index 93b240278af2..9fcb1b7ac26e 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.2.18
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.2.18
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/aws-sdk-core-2.2.18[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.2.18.tar.gz -> aws-sdk-ruby-2.2.18.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2e13d15bd996d3abc5ed8620f7c83852
diff --git a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.2.5 b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.2.5
index e724c0a3031d..45a91b5e81d3 100644
--- a/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.2.5
+++ b/metadata/md5-cache/dev-ruby/aws-sdk-resources-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/aws-sdk-core-2.2.5[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/aws/aws-sdk-ruby/archive/v2.2.5.tar.gz -> aws-sdk-ruby-2.2.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2e13d15bd996d3abc5ed8620f7c83852
diff --git a/metadata/md5-cache/dev-ruby/backports-3.6.7 b/metadata/md5-cache/dev-ruby/backports-3.6.7
index bebc81188772..ce342a7d5c88 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.6.7
+++ b/metadata/md5-cache/dev-ruby/backports-3.6.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/backports-3.6.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b918791c20c7897b814f1c9dc711ca68
diff --git a/metadata/md5-cache/dev-ruby/backports-3.6.8 b/metadata/md5-cache/dev-ruby/backports-3.6.8
index 221c8fd15db1..e3a5161c6552 100644
--- a/metadata/md5-cache/dev-ruby/backports-3.6.8
+++ b/metadata/md5-cache/dev-ruby/backports-3.6.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/backports-3.6.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=932dadd76060b69a94df02e51c732fde
diff --git a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2 b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
index cfb476a6d029..0346a48ea502 100644
--- a/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bacon-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/bacon-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07f39b4248b5cba07ea07588f3feee98
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.2 b/metadata/md5-cache/dev-ruby/barby-0.6.2
index 8d3cea57bf18..f49f9f900127 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.2
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/891b15594b34229b8bdb267c10ab5b5309c03320.tar.gz -> barby-0.6.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9b679a15eeb6368390a596ab017c7359
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.2-r1 b/metadata/md5-cache/dev-ruby/barby-0.6.2-r1
index dd27089839aa..076bcceaa5a1 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/891b15594b34229b8bdb267c10ab5b5309c03320.tar.gz -> barby-0.6.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29501f214d7efbc5d565a42d51440839
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r1 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r1
index f5cd3979ea92..fce5cb2ea0cc 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby19? ( dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-0.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f7bd44513a76d2ede877b792547aa35
diff --git a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2 b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
index 84dec30fffd2..773099403631 100644
--- a/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/bcat-0.6.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!!<app-accessibility/speech-tools-2.1-r3 ruby_targets_ruby19? ( dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcat-0.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b7708cc83c816f33c6e6c9701a6de554
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.10 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.10
index e17f15f8656a..2da46f3cf663 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.10
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb2c73a28f25088366ef9c9af5e20128
diff --git a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9 b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9
index de4b164b3dee..42cea0a9c59e 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9
+++ b/metadata/md5-cache/dev-ruby/bcrypt-ruby-3.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/bcrypt-3.1.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96782ca68cec41fd9442e9e936323ea4
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-3.0.3 b/metadata/md5-cache/dev-ruby/best_in_place-3.0.3
index 9cab83c1625e..861927eb037c 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-3.0.3
+++ b/metadata/md5-cache/dev-ruby/best_in_place-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/best_in_place-3.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=789fb85a5895ed03ee8a76c5b5312bed
diff --git a/metadata/md5-cache/dev-ruby/best_in_place-3.1.0 b/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
index 7eeba7c31a98..74eae8e223a1 100644
--- a/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
+++ b/metadata/md5-cache/dev-ruby/best_in_place-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/actionpack-3.2:*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/best_in_place-3.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=a17458d7c93a925d15bc95c3ef1f8de2
diff --git a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2 b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
index 3e4b3e61e46e..1f2b440dd87c 100644
--- a/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
+++ b/metadata/md5-cache/dev-ruby/binding_of_caller-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/debug_inspector-0.0.1[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/binding_of_caller-0.7.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=258af760488931659da309d815d9b310
diff --git a/metadata/md5-cache/dev-ruby/bitescript-0.0.9 b/metadata/md5-cache/dev-ruby/bitescript-0.0.9
index b025f65e6f23..59bfb23727ec 100644
--- a/metadata/md5-cache/dev-ruby/bitescript-0.0.9
+++ b/metadata/md5-cache/dev-ruby/bitescript-0.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( virtual/rub
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/bitescript-0.0.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fc7b261d872b71748ed305b9d4f1f111
diff --git a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4 b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
index e89f52df3751..4cf55e970e59 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
+++ b/metadata/md5-cache/dev-ruby/blankslate-2.1.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/blankslate-2.1.2.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59858531fe8647cff907074ef467091b
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.2 b/metadata/md5-cache/dev-ruby/blankslate-3.1.2
index 84437225585a..9effc0329ac5 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.2
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/blankslate-3.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d54cabd8a910f1e76a28bcfcf0dbf395
diff --git a/metadata/md5-cache/dev-ruby/blankslate-3.1.3 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
index 15686818fa80..6e6f723cf315 100644
--- a/metadata/md5-cache/dev-ruby/blankslate-3.1.3
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/blankslate-3.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee1bbe6f260ac881675a1264db39d7eb
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r1 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r1
index 098a395d0171..9a4060d113bc 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac653f1a74ae2e8fcf0021efec380041
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
index 8d79b7f54715..62e927918fce 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4974d1b0f8ae0a8fe7435389c6e86741
diff --git a/metadata/md5-cache/dev-ruby/bones-3.8.1-r1 b/metadata/md5-cache/dev-ruby/bones-3.8.1-r1
index b5b831054e30..e4a244ec9b27 100644
--- a/metadata/md5-cache/dev-ruby/bones-3.8.1-r1
+++ b/metadata/md5-cache/dev-ruby/bones-3.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bones-3.8.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f55feefa453679fcbd4f9f75e236f3b
diff --git a/metadata/md5-cache/dev-ruby/bones-3.8.3 b/metadata/md5-cache/dev-ruby/bones-3.8.3
index 5c9d868359c1..e88c7a931054 100644
--- a/metadata/md5-cache/dev-ruby/bones-3.8.3
+++ b/metadata/md5-cache/dev-ruby/bones-3.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bones-3.8.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=098e602a4abe2035338f5e16c6fe4ff3
diff --git a/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1 b/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1
index 327cdbc85dd1..42066ea2cb85 100644
--- a/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1
+++ b/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0146.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( virtual/rub
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/bouncy-castle-java-1.5.0146.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0466465af94e9d8928fe3ec925d33fb
diff --git a/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147 b/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147
index 298a15532d50..27a0acfd484b 100644
--- a/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147
+++ b/metadata/md5-cache/dev-ruby/bouncy-castle-java-1.5.0147
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_jruby? ( virtual/rub
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/bouncy-castle-java-1.5.0147.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1824c3aa769b45f32714762d8878512c
diff --git a/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1 b/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
index 01a4dfcb1d51..4b179c71392b 100644
--- a/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/bourne-1.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mocha-0.13.2:0.13[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/bourne-1.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4e84f938b80e7a7052f52a2726188ba
diff --git a/metadata/md5-cache/dev-ruby/bourne-1.6.0 b/metadata/md5-cache/dev-ruby/bourne-1.6.0
index 6b35e887d127..ee26f971163c 100644
--- a/metadata/md5-cache/dev-ruby/bourne-1.6.0
+++ b/metadata/md5-cache/dev-ruby/bourne-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mocha-1.1:1.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bourne-1.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=071b422e260e00a37737d761a0357793
diff --git a/metadata/md5-cache/dev-ruby/brass-1.2.1 b/metadata/md5-cache/dev-ruby/brass-1.2.1
index d823aebee600..9a5db5779c44 100644
--- a/metadata/md5-cache/dev-ruby/brass-1.2.1
+++ b/metadata/md5-cache/dev-ruby/brass-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/brass-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0579fc217107da472a3a15d73347ad60
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
index d84b0f40828b..1ba6a0aa4116 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/bsearch-1.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70aec20c11b8dddeffff4e9cb12c298a
diff --git a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2 b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
index 37bd7a60baa1..569836e0794e 100644
--- a/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bsearch-1.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ab785730dc35dda630ee9afc9e57aa9
diff --git a/metadata/md5-cache/dev-ruby/bson-1.12.0 b/metadata/md5-cache/dev-ruby/bson-1.12.0
index e826a1ff6510..4f15d61b55ba 100644
--- a/metadata/md5-cache/dev-ruby/bson-1.12.0
+++ b/metadata/md5-cache/dev-ruby/bson-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/1.12.0.tar.gz -> mongo-ruby-driver-1.12.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=740e40c709df15937e98adc672d7e8f1
diff --git a/metadata/md5-cache/dev-ruby/bson-3.2.4 b/metadata/md5-cache/dev-ruby/bson-3.2.4
index eb5670fdb8f2..73d9a262ea76 100644
--- a/metadata/md5-cache/dev-ruby/bson-3.2.4
+++ b/metadata/md5-cache/dev-ruby/bson-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v3.2.4.tar.gz -> bson-3.2.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6be1f9376b6a12be575300f878ad5878
diff --git a/metadata/md5-cache/dev-ruby/bson-3.2.6 b/metadata/md5-cache/dev-ruby/bson-3.2.6
index a0bdcd8e86aa..f6e02bab0d3c 100644
--- a/metadata/md5-cache/dev-ruby/bson-3.2.6
+++ b/metadata/md5-cache/dev-ruby/bson-3.2.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/mongodb/bson-ruby/archive/v3.2.6.tar.gz -> bson-3.2.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6be1f9376b6a12be575300f878ad5878
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0 b/metadata/md5-cache/dev-ruby/buftok-0.2.0
index 702b68f1695f..bf66cd4e5238 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/buftok-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=83570586a43f75bf400379345d34d079
diff --git a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1 b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
index e80a083399f3..ce3bfce0cf0b 100644
--- a/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/buftok-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/buftok-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=462b87c62fed301df6200e4bc3b12a9e
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 08156f3e3397..a2a6f38aa78f 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3
 SRC_URI=mirror://rubygems/builder-3.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53c8f6d0532a8c03cb317d81ca159b88
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 352a46ca744e..fcfd19b560ec 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/builder-3.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/builder-3.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d00022988b3fd473778ecf5fb2834dd4
diff --git a/metadata/md5-cache/dev-ruby/builder-3.1.4 b/metadata/md5-cache/dev-ruby/builder-3.1.4
index d0b84c523744..f23220fb549b 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.1.4
+++ b/metadata/md5-cache/dev-ruby/builder-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.1
 SRC_URI=mirror://rubygems/builder-3.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a8d62a2c19c2baf49b08212e5d9ffb20
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.2 b/metadata/md5-cache/dev-ruby/builder-3.2.2
index e7baa3f37481..6a070b5a17cc 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.2
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=012120329bfa95bf95ac4f368377a4ae
diff --git a/metadata/md5-cache/dev-ruby/builder-3.2.2-r1 b/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
index 513941268b0a..a9d2f1f31f8b 100644
--- a/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/builder-3.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/builder-3.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c5d4937dff0477fce94521ba5447a675
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.10.6 b/metadata/md5-cache/dev-ruby/bundler-1.10.6
index 945e76216c4f..64beda7ac616 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.10.6
+++ b/metadata/md5-cache/dev-ruby/bundler-1.10.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ff06591607aa6585cd8e76b801b7af8
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.11.2 b/metadata/md5-cache/dev-ruby/bundler-1.11.2
index 9d1d29959637..ecd88553a321 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.11.2
+++ b/metadata/md5-cache/dev-ruby/bundler-1.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/carlhuda/bundler/archive/v1.11.2.tar.gz -> bundler-1.11.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=297f4759eb8297c3b03494a3730c9211
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.8.9 b/metadata/md5-cache/dev-ruby/bundler-1.8.9
index e4143df2c3e0..35809ecbd9a4 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.8.9
+++ b/metadata/md5-cache/dev-ruby/bundler-1.8.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b4c45f50ae6aebf5f29b1ed2e62e885e
diff --git a/metadata/md5-cache/dev-ruby/bundler-1.9.10 b/metadata/md5-cache/dev-ruby/bundler-1.9.10
index b89384db2d06..81aa502f3884 100644
--- a/metadata/md5-cache/dev-ruby/bundler-1.9.10
+++ b/metadata/md5-cache/dev-ruby/bundler-1.9.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b928dbaaf336a3c420b69751e4a0ab7
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.4.0 b/metadata/md5-cache/dev-ruby/bundler-audit-0.4.0
index 146ae78e86c7..ed02118b6ed6 100644
--- a/metadata/md5-cache/dev-ruby/bundler-audit-0.4.0
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/thor-0.18:0[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bundler-audit-0.4.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c6868cf891f75fbc3c92b29886a2791
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.0.1 b/metadata/md5-cache/dev-ruby/bunny-2.0.1
index 84da3052d749..bc9c229cbf71 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.0.1
+++ b/metadata/md5-cache/dev-ruby/bunny-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.9.2[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5684028ba6d8bec60315c4a9ecd27c86
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.2.1 b/metadata/md5-cache/dev-ruby/bunny-2.2.1
index c3ac757b29cc..da8586babdf7 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.2.1
+++ b/metadata/md5-cache/dev-ruby/bunny-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/amq-protocol:2[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dcc1124686acd59ba22e889781d3dfb5
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.2.2 b/metadata/md5-cache/dev-ruby/bunny-2.2.2
index 5bd519461971..9283ad67ea73 100644
--- a/metadata/md5-cache/dev-ruby/bunny-2.2.2
+++ b/metadata/md5-cache/dev-ruby/bunny-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/bunny-2.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e761fae5072ae51bbeaabfa4a78ecf9
diff --git a/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2 b/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
index b5ca5b79dc06..4bc5f34c3f58 100644
--- a/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
+++ b/metadata/md5-cache/dev-ruby/calendar_date_select-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rails-3.1:*[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/calendar_date_select-2.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=10a537c054ad48f079021db42cc6f2ea
diff --git a/metadata/md5-cache/dev-ruby/camping-2.1.532 b/metadata/md5-cache/dev-ruby/camping-2.1.532
index 1abe8f744d73..bfa63071abe9 100644
--- a/metadata/md5-cache/dev-ruby/camping-2.1.532
+++ b/metadata/md5-cache/dev-ruby/camping-2.1.532
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby19] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/camping-2.1.532.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eaa94218c92a32e0bdf5544c6c8b7c7b
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 649688a45be6..068a028e6a37 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/capistrano-2.15.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af79b74cb09e07b51eec08c583d2ef12
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 ed0d00255c66..dd9e780399d7 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
+++ b/metadata/md5-cache/dev-ruby/capistrano-2.15.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.0.14[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f94b83f8e483d6525835d3d221aea85
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.3.5 b/metadata/md5-cache/dev-ruby/capistrano-3.3.5
index 45116b06ff99..ac0533728815 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.3.5
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/capistrano-stats-1.1.0:1[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/capistrano-3.3.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ac70ad928f10eef520e87084916b41e
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.4.0 b/metadata/md5-cache/dev-ruby/capistrano-3.4.0
index cfb408154b78..f1b06f7aafa6 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-3.4.0
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/capistrano-3.4.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c78b4a3f055af9c3e4f8ec29d977ebfe
diff --git a/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1 b/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
index a8a63bfdcbc0..406e2220c99b 100644
--- a/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
+++ b/metadata/md5-cache/dev-ruby/capistrano-stats-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/capistrano-stats-1.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0d34101f60ac22d0e6e5c61098a6f8e2
diff --git a/metadata/md5-cache/dev-ruby/capybara-1.1.4 b/metadata/md5-cache/dev-ruby/capybara-1.1.4
index 323971473fb9..9e5a3a5259bf 100644
--- a/metadata/md5-cache/dev-ruby/capybara-1.1.4
+++ b/metadata/md5-cache/dev-ruby/capybara-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/capybara-1.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=43191e2c0215d200de9d5938ac733ede
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.5.0 b/metadata/md5-cache/dev-ruby/capybara-2.5.0
index f56493c9b227..3d63aabd9de3 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.5.0
+++ b/metadata/md5-cache/dev-ruby/capybara-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=b1f1cb27de52548371ba07f767250cd5
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.6.0 b/metadata/md5-cache/dev-ruby/capybara-2.6.0
index df6aa14b3643..9bbf81c4d085 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.6.0
+++ b/metadata/md5-cache/dev-ruby/capybara-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16:*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=e0db277aa8611c72bdab75265e8bd5a9
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.6.2 b/metadata/md5-cache/dev-ruby/capybara-2.6.2
index 959a8e3ba51e..6a209491a8f5 100644
--- a/metadata/md5-cache/dev-ruby/capybara-2.6.2
+++ b/metadata/md5-cache/dev-ruby/capybara-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] >=dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/capybara-2.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=d50fe030348d0a1da57cfa086c7f97bb
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.16.0 b/metadata/md5-cache/dev-ruby/celluloid-0.16.0
index 6148ecb150c6..bc223a928f81 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.16.0
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.16.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid/archive/v0.16.0.tar.gz -> celluloid-0.16.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cdfb79b81a2de5796d3a0439baec1e08
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1 b/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
index a2994672455b..00c663833adc 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.16.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/timers-4.0.0:4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid/archive/v0.16.0.tar.gz -> celluloid-0.16.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0528c226ac7642a3bcfbe802d507031
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.17.2 b/metadata/md5-cache/dev-ruby/celluloid-0.17.2
index a20753e2dc03..efbc16b39ba4 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.17.2
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.17.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/celluloid-essentials[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/celluloid-0.17.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=de720b9c33a0654f2ab94e09bee3c0e7
diff --git a/metadata/md5-cache/dev-ruby/celluloid-0.17.3 b/metadata/md5-cache/dev-ruby/celluloid-0.17.3
index 1b4ce582f510..e63735362a3a 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-0.17.3
+++ b/metadata/md5-cache/dev-ruby/celluloid-0.17.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/celluloid-essentials[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/celluloid-0.17.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=de720b9c33a0654f2ab94e09bee3c0e7
diff --git a/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
index 718faa8ab9c2..b016569a4d40 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-essentials-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-essentials/archive/v0.20.5.tar.gz -> celluloid-essentials-0.20.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=860bb636020c15aaa559530c4d9064f1
diff --git a/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
index 1c91f673b34c..4b4af65b49f3 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-extras-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-extras/archive/v0.20.5.tar.gz -> celluloid-extras-0.20.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c22a8d0eec50497c1297fbb1d0c7f716
diff --git a/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
index 728f999fde73..b6719703c369 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-fsm-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-fsm/archive/v0.20.5.tar.gz -> celluloid-fsm-0.20.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=67dd463b949a4cd88f60cc3da259febe
diff --git a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2 b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
index 77be82db460d..43d99231054b 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
+++ b/metadata/md5-cache/dev-ruby/celluloid-io-0.16.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/celluloid-0.16.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/celluloid-io-0.16.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78a4143cd87f7db4fbd5385cf871fcc8
diff --git a/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
index ab46f284268a..4d4ea0d5b011 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-pool-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-pool/archive/v0.20.5.tar.gz -> celluloid-pool-0.20.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=67dd463b949a4cd88f60cc3da259febe
diff --git a/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.5 b/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.5
index 114b8bc4511f..5f291bc5e15f 100644
--- a/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.5
+++ b/metadata/md5-cache/dev-ruby/celluloid-supervision-0.20.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/timers-4.1.1[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/celluloid/celluloid-supervision/archive/v0.20.5.tar.gz -> celluloid-supervision-0.20.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=67dd463b949a4cd88f60cc3da259febe
diff --git a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6 b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6
index d5a8a9e5f20a..e16a459f9950 100644
--- a/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6
+++ b/metadata/md5-cache/dev-ruby/certificate_authority-0.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0.6:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/certificate_authority-0.1.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62d31b9a0cc3163d6681569efd5690ed
diff --git a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3 b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
index 571488892802..d88781b5e2fb 100644
--- a/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
+++ b/metadata/md5-cache/dev-ruby/charlock_holmes-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/icu:= sys-libs/zlib ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/charlock_holmes-0.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=817a49e387f70039a243cc233f5a37e8
diff --git a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1 b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
index 298443941db6..abe07c8bcf25 100644
--- a/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/childlabor-0.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/carllerche/childlabor/archive/6518b939dddbad20c7f05aa075d76e3ca6e70447.tar.gz -> childlabor-0.0.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc83e5b1b20b0e181e338be582261a2e
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.3 b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
index cb0b92b70dee..0e708e1552c4 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.3
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e23d7b455e1332b72f81ede407252481
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.8 b/metadata/md5-cache/dev-ruby/childprocess-0.5.8
index e1b005df3971..c8d994717bb2 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.8
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1dbf6dedde9e7993c31ad6239649e77d
diff --git a/metadata/md5-cache/dev-ruby/childprocess-0.5.9 b/metadata/md5-cache/dev-ruby/childprocess-0.5.9
index 36cc697a81d7..b25e35bf7e1e 100644
--- a/metadata/md5-cache/dev-ruby/childprocess-0.5.9
+++ b/metadata/md5-cache/dev-ruby/childprocess-0.5.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ffi-1.0.11[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/childprocess-0.5.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e238ea8dcdc0d326bcd8d2a47ec27601
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2 b/metadata/md5-cache/dev-ruby/chronic-0.10.2
index 6e801a0a57c8..5ad1ff31acf9 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/chronic-0.10.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c6a40c4b0f2916b15a48a17239fa0b31
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.5 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.5
index c8a29a4a5bcb..9d5414086867 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.5
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/chunky_png-1.3.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8a29560c8e0f649e37427266fae9aa3
diff --git a/metadata/md5-cache/dev-ruby/classifier-1.3.4 b/metadata/md5-cache/dev-ruby/classifier-1.3.4
index c74d0c2e5f8a..22126b98fc18 100644
--- a/metadata/md5-cache/dev-ruby/classifier-1.3.4
+++ b/metadata/md5-cache/dev-ruby/classifier-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/classifier-1.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f5f235d56fe9f75f07b84f5f6816aa9
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.3 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.3
index 0d1cdc3914c7..3265714bfa36 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.3
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/v2.0.3.tar.gz -> classifier-reborn-2.0.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=196b4f7b41704f05ad8adfc2c0447584
diff --git a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4 b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
index 0a82472686f1..7873b1bf9b75 100644
--- a/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
+++ b/metadata/md5-cache/dev-ruby/classifier-reborn-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/classifier-reborn/archive/2.0.4.tar.gz -> classifier-reborn-2.0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c0f25e3c8b707dc865eb22dbb412b80e
diff --git a/metadata/md5-cache/dev-ruby/climate_control-0.0.3 b/metadata/md5-cache/dev-ruby/climate_control-0.0.3
index 119837a1084b..8eab2ee23f45 100644
--- a/metadata/md5-cache/dev-ruby/climate_control-0.0.3
+++ b/metadata/md5-cache/dev-ruby/climate_control-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/climate_control-0.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29b518b03ca7eb2d67c9a5194fbd36c6
diff --git a/metadata/md5-cache/dev-ruby/cliver-0.3.2 b/metadata/md5-cache/dev-ruby/cliver-0.3.2
index 5aad6bfe7d8a..9e69326ccc6e 100644
--- a/metadata/md5-cache/dev-ruby/cliver-0.3.2
+++ b/metadata/md5-cache/dev-ruby/cliver-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cliver-0.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=592bb54bbe98f791275e77b56b2f7e2e
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6 b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6
index ba4db4571e7c..b542c9584c02 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6
+++ b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/cmdparse-2.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=728a0c85e7ca12d0c832d8c36ab6a393
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1 b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
index dbef19ec3928..86f49a00dd42 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cmdparse-2.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=041d8d9ff92720df36957d8fc3e45ed1
diff --git a/metadata/md5-cache/dev-ruby/cmdparse-3.0.1 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
index 7dc150c5527b..b1cb5d135aa0 100644
--- a/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/cmdparse-3.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14ce3153cfa88bfd91e162b0126ba749
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.5 b/metadata/md5-cache/dev-ruby/cocaine-0.5.5
index 75d8c49d9231..f1939f1852e6 100644
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.5
+++ b/metadata/md5-cache/dev-ruby/cocaine-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/climate_control:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cocaine-0.5.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0c32e9b3082ef77996d08540fd195fa
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.7 b/metadata/md5-cache/dev-ruby/cocaine-0.5.7
index c8c6df828c87..07d24dc8856b 100644
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.7
+++ b/metadata/md5-cache/dev-ruby/cocaine-0.5.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/climate_control:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cocaine-0.5.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3536010d4f0e526d172d4f37e613bbad
diff --git a/metadata/md5-cache/dev-ruby/cocaine-0.5.8 b/metadata/md5-cache/dev-ruby/cocaine-0.5.8
index 60e87924026d..1bc4ac151adb 100644
--- a/metadata/md5-cache/dev-ruby/cocaine-0.5.8
+++ b/metadata/md5-cache/dev-ruby/cocaine-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/climate_control:0[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cocaine-0.5.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d73c0b2c55654c582a2d2f019cb2847
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
index 71f55f88dceb..3a696797df50 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/tarball/v1.1.0 -> coderay-1.1.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7785aeb3f542161e9ab74a38de2f2751
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2 b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
index 3f14bb91fb49..642973e3ecfd 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.0.tar.gz -> coderay-1.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef4cf6d33cda5f00cfdbdbe7ca44c78c
diff --git a/metadata/md5-cache/dev-ruby/coderay-1.1.1 b/metadata/md5-cache/dev-ruby/coderay-1.1.1
index 9a056a875bb1..1dad3d5edca4 100644
--- a/metadata/md5-cache/dev-ruby/coderay-1.1.1
+++ b/metadata/md5-cache/dev-ruby/coderay-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rubychan/coderay/archive/v1.1.1.tar.gz -> coderay-1.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff9495961b5e09f90975ee34a7e6a339
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-3.2.2 b/metadata/md5-cache/dev-ruby/coffee-rails-3.2.2
index 7b5c014c2e7c..18d194703bfc 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-3.2.2
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/coffee-rails-3.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0c46a083b64bd2c2b2588f721e808f0
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1 b/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
index 2738a66804ce..81b262bcadf7 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/coffee-rails-4.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=24d260cc5c4b5612c2f12b7fd0582d8f
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.0 b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.0
index 3d92781f8197..638ac26f49a9 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.0
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=mirror://rubygems/coffee-rails-4.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f674b293668f9092808d60317142d51
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1 b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1
index 457e3b08f4ab..7a8306fb364f 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.1.1.tar.gz -> 4.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2264933935cc6a56155a37e5f924dc7b
diff --git a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r1 b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r1
index 4c5ba145c761..0e5189cc9367 100644
--- a/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/coffee-rails-4.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/coffee-script-2.2.0[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.1
 SRC_URI=https://github.com/rails/coffee-rails/archive/v4.1.1.tar.gz -> 4.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4492aedc2a657fb4a83a4868a4ea63ba
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1 b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
index 539393c37814..e18514d9f31b 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
+++ b/metadata/md5-cache/dev-ruby/coffee-script-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-script-source[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-2.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b045c00c2183e2c609bfc737fe6d635
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0
index 96cc6695a01f..47de0ceefaac 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.10.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27a23c1040c2f88a2639ecd67b6ce7e0
diff --git a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3 b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
index 303e13e9a02a..7aa10b53daa3 100644
--- a/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
+++ b/metadata/md5-cache/dev-ruby/coffee-script-source-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/coffee-script-source-1.9.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1cfc7dde970627bdefbf48ec6d0b40af
diff --git a/metadata/md5-cache/dev-ruby/color-1.8 b/metadata/md5-cache/dev-ruby/color-1.8
index c6debcee48ab..330402fea73d 100644
--- a/metadata/md5-cache/dev-ruby/color-1.8
+++ b/metadata/md5-cache/dev-ruby/color-1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/halostatue/color/archive/v1.8.tar.gz -> color-1.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=782ac90f6bf8c93215843e72726d94b1
diff --git a/metadata/md5-cache/dev-ruby/colorator-0.1-r1 b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
index 004403040143..e3700a38b378 100644
--- a/metadata/md5-cache/dev-ruby/colorator-0.1-r1
+++ b/metadata/md5-cache/dev-ruby/colorator-0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorator-0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fa272429fda2a1b8fdad9ff231a09154
diff --git a/metadata/md5-cache/dev-ruby/colored-1.2 b/metadata/md5-cache/dev-ruby/colored-1.2
index 4a5b4612bb00..1e8c2a31c694 100644
--- a/metadata/md5-cache/dev-ruby/colored-1.2
+++ b/metadata/md5-cache/dev-ruby/colored-1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/colored-1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=696b0e47b23462f495bd02e9478b3391
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.7.5 b/metadata/md5-cache/dev-ruby/colorize-0.7.5
index ad350a7eb4e2..586ec83037df 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.7.5
+++ b/metadata/md5-cache/dev-ruby/colorize-0.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorize-0.7.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3be743fe4bd304167c9e09b9f6c5fc13
diff --git a/metadata/md5-cache/dev-ruby/colorize-0.7.7 b/metadata/md5-cache/dev-ruby/colorize-0.7.7
index 22b933f5e23b..9dcadc52e736 100644
--- a/metadata/md5-cache/dev-ruby/colorize-0.7.7
+++ b/metadata/md5-cache/dev-ruby/colorize-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/colorize-0.7.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f6b6b89290a6832dd576a530925344fe
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.8.9 b/metadata/md5-cache/dev-ruby/columnize-0.8.9
index 9687cd3232f1..0aa26d1d1f84 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.8.9
+++ b/metadata/md5-cache/dev-ruby/columnize-0.8.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/columnize-0.8.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d263d7ab81729f1c1af9e6b18378ded
diff --git a/metadata/md5-cache/dev-ruby/columnize-0.9.0 b/metadata/md5-cache/dev-ruby/columnize-0.9.0
index 15497f3afcd1..cf4d0ea05b58 100644
--- a/metadata/md5-cache/dev-ruby/columnize-0.9.0
+++ b/metadata/md5-cache/dev-ruby/columnize-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/columnize-0.9.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef24e2c105997fb48c72b1e8deb1a7f8
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.5.3 b/metadata/md5-cache/dev-ruby/combustion-0.5.3
index 5e35fa41e009..17406cd61f58 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.5.3
+++ b/metadata/md5-cache/dev-ruby/combustion-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/combustion-0.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e53d8bd826b6cfd4f69636c3b1012b31
diff --git a/metadata/md5-cache/dev-ruby/combustion-0.5.4 b/metadata/md5-cache/dev-ruby/combustion-0.5.4
index 5280f76cc4b0..544da0fd8ba4 100644
--- a/metadata/md5-cache/dev-ruby/combustion-0.5.4
+++ b/metadata/md5-cache/dev-ruby/combustion-0.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/combustion-0.5.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ed7def98a2649c4550fa806f587f28a
diff --git a/metadata/md5-cache/dev-ruby/commander-4.3.7 b/metadata/md5-cache/dev-ruby/commander-4.3.7
index e5e9f7291986..84a79a03d408 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.3.7
+++ b/metadata/md5-cache/dev-ruby/commander-4.3.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.3.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da4c0f37b89834fe8a9cdd577ae59a9d
diff --git a/metadata/md5-cache/dev-ruby/commander-4.3.8 b/metadata/md5-cache/dev-ruby/commander-4.3.8
index fa9bd9dce06b..2973c2303d71 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.3.8
+++ b/metadata/md5-cache/dev-ruby/commander-4.3.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.3.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da4c0f37b89834fe8a9cdd577ae59a9d
diff --git a/metadata/md5-cache/dev-ruby/commander-4.4.0 b/metadata/md5-cache/dev-ruby/commander-4.4.0
index b48e14f70e4d..2fb244093c48 100644
--- a/metadata/md5-cache/dev-ruby/commander-4.4.0
+++ b/metadata/md5-cache/dev-ruby/commander-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/highline-1.7.2[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/commander-4.4.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da4c0f37b89834fe8a9cdd577ae59a9d
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.1-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.1-r1
index ef4977e17268..79598eb1c9e8 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/compass-1.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b5ac20238b343526aee5b6014c12d21
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
index a7435e321733..d7e18d3f7d41 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/compass-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09183a7beddeb87e4e03b43c6815f237
diff --git a/metadata/md5-cache/dev-ruby/compass-core-1.0.1 b/metadata/md5-cache/dev-ruby/compass-core-1.0.1
index e32468ef44ae..dd71c31100c6 100644
--- a/metadata/md5-cache/dev-ruby/compass-core-1.0.1
+++ b/metadata/md5-cache/dev-ruby/compass-core-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-core-1.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b3968ed435fbf3a1dc0fb8d71d950dc
diff --git a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
index 3c301faf3dc7..34822dd6521c 100644
--- a/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-core-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d38acbe626ec1e3fa3af5d9bce66f575
diff --git a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5 b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
index a8d570ccca79..7e1a2c2fa0cb 100644
--- a/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
+++ b/metadata/md5-cache/dev-ruby/compass-import-once-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/sass-3.2:*[ruby_targets_ruby20] <dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/compass-import-once-1.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1b67b4ae9f355bc5fac5cd1d41ee56a
diff --git a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.0 b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.0
index b8cd8e830109..3f79e171c145 100644
--- a/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.0
+++ b/metadata/md5-cache/dev-ruby/concurrent-ruby-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/ruby-concurrency/concurrent-ruby/archive/v1.0.0.tar.gz -> concurrent-ruby-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e63fb9e86c2b063656b1e670f32a5605
diff --git a/metadata/md5-cache/dev-ruby/configliere-0.4.18-r1 b/metadata/md5-cache/dev-ruby/configliere-0.4.18-r1
index 43b02c44807a..8312577df3aa 100644
--- a/metadata/md5-cache/dev-ruby/configliere-0.4.18-r1
+++ b/metadata/md5-cache/dev-ruby/configliere-0.4.18-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/configliere-0.4.18.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0071ba3585736a090b80028205c9042b
diff --git a/metadata/md5-cache/dev-ruby/configliere-0.4.22 b/metadata/md5-cache/dev-ruby/configliere-0.4.22
index 30433d5053ca..a258893a6d4e 100644
--- a/metadata/md5-cache/dev-ruby/configliere-0.4.22
+++ b/metadata/md5-cache/dev-ruby/configliere-0.4.22
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.2[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/configliere-0.4.22.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=30b53819c8c4f3d64f9537536c6f1446
diff --git a/metadata/md5-cache/dev-ruby/connection_pool-2.2.0 b/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
index 9e3b69f4cdc8..eb5149813efa 100644
--- a/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
+++ b/metadata/md5-cache/dev-ruby/connection_pool-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/connection_pool-2.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3fdefb5b75ec38b8427e89a07be5dcf
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.12.0 b/metadata/md5-cache/dev-ruby/contracts-0.12.0
index d971d29e79bf..02d433db02b7 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.12.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/contracts-0.12.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0288c700d1e8405634795f5f8330380f
diff --git a/metadata/md5-cache/dev-ruby/contracts-0.13.0 b/metadata/md5-cache/dev-ruby/contracts-0.13.0
index bb2a47156281..3abd83eb7682 100644
--- a/metadata/md5-cache/dev-ruby/contracts-0.13.0
+++ b/metadata/md5-cache/dev-ruby/contracts-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/contracts-0.13.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf65e0e7d0c9ca371fdc10cb169b77fe
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.4.1 b/metadata/md5-cache/dev-ruby/coolio-1.4.1
index 8a501f9a4b47..4428e9363d28 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.4.1
+++ b/metadata/md5-cache/dev-ruby/coolio-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libev-4.19 ruby_targets_ruby19? ( >=dev-ruby/iobuffer-1[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=83e2bb7e2d84040952c44813e9eda3dc
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.4.2 b/metadata/md5-cache/dev-ruby/coolio-1.4.2
index 4ceeaaf7afd0..a47b7f16208e 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.4.2
+++ b/metadata/md5-cache/dev-ruby/coolio-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libev-4.20 ruby_targets_ruby20? ( >=dev-ruby/iobuffer-1[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d0739f10b03c61bc0b6158c08fb0f2ab
diff --git a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1 b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
index defa9f4b65e8..bc84bed350f2 100644
--- a/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/countdownlatch-1.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/countdownlatch-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fec9c93e43e1da1cb64e16dce5b37615
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.2 b/metadata/md5-cache/dev-ruby/crack-0.4.2
index 76048b18fc87..59dec90a8bd7 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.2
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=13117da5f78cdc4c3ee4f0e9df0769ad
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1 b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
index 58b6ba9bcc0f..c5b7b33079d8 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f33496ef18277ea8a5e52fa9b8efe38d
diff --git a/metadata/md5-cache/dev-ruby/crack-0.4.3 b/metadata/md5-cache/dev-ruby/crack-0.4.3
index d21c9057b52e..cabc8161202d 100644
--- a/metadata/md5-cache/dev-ruby/crack-0.4.3
+++ b/metadata/md5-cache/dev-ruby/crack-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/safe_yaml-1.0.0[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/crack-0.4.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5b1b63c234fffbe523c56c13559ae3f
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.2 b/metadata/md5-cache/dev-ruby/crass-1.0.2
index 17965622e649..263396ac5a15 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.2
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/crass-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b2ffa82c3b4f172028bf199c89075c0
diff --git a/metadata/md5-cache/dev-ruby/creole-0.5.0 b/metadata/md5-cache/dev-ruby/creole-0.5.0
index 7702ea15a04e..be18ddc0463d 100644
--- a/metadata/md5-cache/dev-ruby/creole-0.5.0
+++ b/metadata/md5-cache/dev-ruby/creole-0.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/minad/creole/archive/v0.5.0.tar.gz -> creole-0.5.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4555f553ab61d98543c6f2bab8138ab
diff --git a/metadata/md5-cache/dev-ruby/cri-2.7.0 b/metadata/md5-cache/dev-ruby/cri-2.7.0
index 8c99343ee0bd..62fc68799d7d 100644
--- a/metadata/md5-cache/dev-ruby/cri-2.7.0
+++ b/metadata/md5-cache/dev-ruby/cri-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/colored-1.2[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cri-2.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ce766cceeec10905da20e016b1f6515
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1 b/metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1
index c633c04520eb..a3dee9fb83fc 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.3.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] virtual
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.3.5.tar.gz -> css_parser-1.3.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd4bde342ec92ad32f8b87f15af26928
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.3.6 b/metadata/md5-cache/dev-ruby/css_parser-1.3.6
index 936877c93fff..c33ce05cbcd0 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.3.6
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] virtual
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.3.6.tar.gz -> css_parser-1.3.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a61552a5c3eb0d1fc7886057195a0b8
diff --git a/metadata/md5-cache/dev-ruby/curb-0.8.8 b/metadata/md5-cache/dev-ruby/curb-0.8.8
index 8a72c4e7651a..73555c8c0b5a 100644
--- a/metadata/md5-cache/dev-ruby/curb-0.8.8
+++ b/metadata/md5-cache/dev-ruby/curb-0.8.8
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl[ssl] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/curb-0.8.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=726a339fcfdd9bad426f7a9ddc61b684
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.10 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.10
index 86bef6870186..320c2bbe24c9 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.10
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/d3_rails-3.5.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9f676d85a18e0a5bcd4adeeef949293
diff --git a/metadata/md5-cache/dev-ruby/d3_rails-3.5.11 b/metadata/md5-cache/dev-ruby/d3_rails-3.5.11
index 6c5761c8e5d0..0b7562634e63 100644
--- a/metadata/md5-cache/dev-ruby/d3_rails-3.5.11
+++ b/metadata/md5-cache/dev-ruby/d3_rails-3.5.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/railties-3.1:*[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/d3_rails-3.5.11.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9f676d85a18e0a5bcd4adeeef949293
diff --git a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1 b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
index 40dd5a11bb3e..873d884e49f1 100644
--- a/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/daemon_controller-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemon_controller-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b9b8b5b2119b48c14621d9c5eb3a4f7
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.3 b/metadata/md5-cache/dev-ruby/daemons-1.2.3
index 8d9bfd3c62d1..ae8c5e74c8a8 100644
--- a/metadata/md5-cache/dev-ruby/daemons-1.2.3
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/daemons-1.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e1a344055ff418f57ccd255c9750684
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.4 b/metadata/md5-cache/dev-ruby/dalli-2.7.4
index 52e1f85031eb..81d96ce89046 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.4
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dalli-2.7.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7590d7d5d51fafce136f1917cfe5e647
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.5 b/metadata/md5-cache/dev-ruby/dalli-2.7.5
index 847307c8feb5..e988f2fb00a7 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.5
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.5.tar.gz -> dalli-2.7.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=189d15937d015e6f1f60fd57be1725d2
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.6 b/metadata/md5-cache/dev-ruby/dalli-2.7.6
index 83b1e4503cf8..13caaadabb5c 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.6
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17276a747c70e4002a52b32eb3eb6f6f
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 0e148d5cc955..6efcc66b51e6 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5b64dc929cc90ef78062618c6a94206
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 22994045ac09..006ff75f278d 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.0
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5b64dc929cc90ef78062618c6a94206
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 7ed8330a2939..0a0652627ec0 100644
--- a/metadata/md5-cache/dev-ruby/database_cleaner-1.5.1
+++ b/metadata/md5-cache/dev-ruby/database_cleaner-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5b64dc929cc90ef78062618c6a94206
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 c677b9017292..ad48ffb1687a 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.8.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce5d3b3337d4e26bb1d0e6103ea66ee3
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 6858154001ad..957196ff92a4 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.8.1
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.8.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce5d3b3337d4e26bb1d0e6103ea66ee3
diff --git a/metadata/md5-cache/dev-ruby/date_validator-0.9.0 b/metadata/md5-cache/dev-ruby/date_validator-0.9.0
index 8341dd3c3bd6..50e3f6950683 100644
--- a/metadata/md5-cache/dev-ruby/date_validator-0.9.0
+++ b/metadata/md5-cache/dev-ruby/date_validator-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.0:*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/date_validator-0.9.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a27c3a138cf65adec738259c0cb03809
diff --git a/metadata/md5-cache/dev-ruby/dbf-2.0.13 b/metadata/md5-cache/dev-ruby/dbf-2.0.13
index 00c686c38bed..6c321d06fcc2 100644
--- a/metadata/md5-cache/dev-ruby/dbf-2.0.13
+++ b/metadata/md5-cache/dev-ruby/dbf-2.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-2.0.13.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad670f8cf7f200b79e96c34118dcd181
diff --git a/metadata/md5-cache/dev-ruby/dbf-2.0.8 b/metadata/md5-cache/dev-ruby/dbf-2.0.8
index 0d1971d91f1c..507d0872616b 100644
--- a/metadata/md5-cache/dev-ruby/dbf-2.0.8
+++ b/metadata/md5-cache/dev-ruby/dbf-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-2.0.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1717acd72d1548448edab71d09fcbe9
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.0.3 b/metadata/md5-cache/dev-ruby/dbf-3.0.3
index 4abde31d9499..f77e5d6224a2 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.0.3
+++ b/metadata/md5-cache/dev-ruby/dbf-3.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-3.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa8e76691646b2940ba759eceb9e26f8
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.0.4 b/metadata/md5-cache/dev-ruby/dbf-3.0.4
index ab01f8205d9b..59b273b3ef91 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.0.4
+++ b/metadata/md5-cache/dev-ruby/dbf-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-3.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74d27fa5c9349ba07047f66474b4d2fd
diff --git a/metadata/md5-cache/dev-ruby/dbf-3.0.5 b/metadata/md5-cache/dev-ruby/dbf-3.0.5
index 2a4878cb2052..a5ed84418a1b 100644
--- a/metadata/md5-cache/dev-ruby/dbf-3.0.5
+++ b/metadata/md5-cache/dev-ruby/dbf-3.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dbf-3.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74d27fa5c9349ba07047f66474b4d2fd
diff --git a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2 b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
index d6d19ae695fd..3e6f14590611 100644
--- a/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
+++ b/metadata/md5-cache/dev-ruby/debug_inspector-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/debug_inspector-0.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed41e18854696950ebbd776925da7a24
diff --git a/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0 b/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
index 5f9b8c80eba9..15fce6c8ce71 100644
--- a/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
+++ b/metadata/md5-cache/dev-ruby/debugger-linecache-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/debugger-linecache-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73400ace69f8617a17de07d2a54d1b08
diff --git a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1 b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
index 409db7d7383b..fe2ef7474f89 100644
--- a/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
+++ b/metadata/md5-cache/dev-ruby/deep_merge-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/deep_merge-1.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3380357b6d3deb66ca5041254c1c15db
diff --git a/metadata/md5-cache/dev-ruby/delayer-0.0.2 b/metadata/md5-cache/dev-ruby/delayer-0.0.2
index 161dac12b4a8..2de1ac65db07 100644
--- a/metadata/md5-cache/dev-ruby/delayer-0.0.2
+++ b/metadata/md5-cache/dev-ruby/delayer-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-0.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=45ae44ae4664fe436b3f22d00236a21f
diff --git a/metadata/md5-cache/dev-ruby/delayer-deferred-1.0.3 b/metadata/md5-cache/dev-ruby/delayer-deferred-1.0.3
index c05d116bf50b..73dfd3a5c020 100644
--- a/metadata/md5-cache/dev-ruby/delayer-deferred-1.0.3
+++ b/metadata/md5-cache/dev-ruby/delayer-deferred-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/delayer-0.0.2:0[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/delayer-deferred-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92c584c709cbff489e12b94a7fa96e65
diff --git a/metadata/md5-cache/dev-ruby/dep_selector-0.1.1 b/metadata/md5-cache/dev-ruby/dep_selector-0.1.1
index fbbcf984edb3..584a677742b8 100644
--- a/metadata/md5-cache/dev-ruby/dep_selector-0.1.1
+++ b/metadata/md5-cache/dev-ruby/dep_selector-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gecode-3.5.0 ruby_targets_ruby19? ( dev-ruby/uuidtools[ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/opscode/dep-selector/archive/0.1.1.tar.gz -> dep_selector-0.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f351e46b2ca51c0ad8facb36eb2b7d36
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1
index 9603481c1d26..7e759ba25a24 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3
 SRC_URI=mirror://rubygems/deprecated-3.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b18d3c713eb9cc6c88e8efa036ad8b5
diff --git a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2 b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
index d09ce1f62011..4f7064b55fb1 100644
--- a/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/deprecated-3.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/deprecated-3.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9ee02b50ca9e421575dd8b2b2980ac25
diff --git a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4 b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
index 1ed73d0f4769..881bbf988c2b 100644
--- a/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
+++ b/metadata/md5-cache/dev-ruby/descendants_tracker-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/thread_safe[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/descendants_tracker-0.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c558c03bd18c7be64243d2711c24841
diff --git a/metadata/md5-cache/dev-ruby/did_you_mean-1.0.0 b/metadata/md5-cache/dev-ruby/did_you_mean-1.0.0
index 4cdf9152009c..623b329c1869 100644
--- a/metadata/md5-cache/dev-ruby/did_you_mean-1.0.0
+++ b/metadata/md5-cache/dev-ruby/did_you_mean-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtua
 REQUIRED_USE=|| ( ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=mirror://rubygems/did_you_mean-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=faed92c5bdeb1d073844871da649ae43
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
index d51a65704fdd..16309653fec8 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.2.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78c04ccd569b0379ffe7fd34df51599f
diff --git a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1 b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
index 5981e26afa29..7c0aff8e5117 100644
--- a/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/diff-lcs-1.2.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d5832a3f2958fb5ba597a307d9877fe
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.58.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.58.0
index d2fec895e67f..01f27b910ebe 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.58.0
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.58.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.58.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6da7c657d3d98dc8acdd46d01920eae2
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.59.0 b/metadata/md5-cache/dev-ruby/dnsruby-1.59.0
index 8afb27a32450..de44cabf5aaa 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.59.0
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.59.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.59.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad9185fa39e4caeaeeee453fbe426dc5
diff --git a/metadata/md5-cache/dev-ruby/dnsruby-1.59.1 b/metadata/md5-cache/dev-ruby/dnsruby-1.59.1
index a6feed0481d4..ae7bae32c560 100644
--- a/metadata/md5-cache/dev-ruby/dnsruby-1.59.1
+++ b/metadata/md5-cache/dev-ruby/dnsruby-1.59.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/dnsruby-1.59.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53d4dd0960661670143fbe8cb438f667
diff --git a/metadata/md5-cache/dev-ruby/docile-1.1.5 b/metadata/md5-cache/dev-ruby/docile-1.1.5
index 56898215aa3f..c04693e98ceb 100644
--- a/metadata/md5-cache/dev-ruby/docile-1.1.5
+++ b/metadata/md5-cache/dev-ruby/docile-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/docile-1.1.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02bc5bae55f2acac2023469dee4040a7
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.24 b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
index 93d6085d7672..77a8b317c31a 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.24
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.24
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.24.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2bccf49c638f3e8f9f471eb77b8d4969
diff --git a/metadata/md5-cache/dev-ruby/domain_name-0.5.25 b/metadata/md5-cache/dev-ruby/domain_name-0.5.25
index 382eb02e1c73..44af7ccefba1 100644
--- a/metadata/md5-cache/dev-ruby/domain_name-0.5.25
+++ b/metadata/md5-cache/dev-ruby/domain_name-0.5.25
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/unf-0.0.5-r1:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/domain_name-0.5.25.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54c9226a9264027821b53d281be928c2
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.0.2 b/metadata/md5-cache/dev-ruby/dotenv-2.0.2
index 898fb43ce42b..fe31595f66cc 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.0.2
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.0.2.tar.gz -> dotenv-2.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9b02290d2e289d4b1aa59752192dde62
diff --git a/metadata/md5-cache/dev-ruby/dotenv-2.1.0 b/metadata/md5-cache/dev-ruby/dotenv-2.1.0
index 96bc12e6feea..852f65daf2e2 100644
--- a/metadata/md5-cache/dev-ruby/dotenv-2.1.0
+++ b/metadata/md5-cache/dev-ruby/dotenv-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/bkeepers/dotenv/archive/v2.1.0.tar.gz -> dotenv-2.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3a3057517de7752aeec25ee36160232
diff --git a/metadata/md5-cache/dev-ruby/duby-0.0.2-r1 b/metadata/md5-cache/dev-ruby/duby-0.0.2-r1
index 10beaec593f3..554b79628cfe 100644
--- a/metadata/md5-cache/dev-ruby/duby-0.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/duby-0.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_jruby? ( dev-ruby/bitescript[ruby_targets_jruby] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/duby-0.0.2-java.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0a17143d6caf1ddcf587e94f4a4158a
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r1 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r1
index 178d3d0671ff..6494e90e2821 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r1
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/dust-0.1.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e39ff1eb6f5fd9d4afdef74f4f581ff
diff --git a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2 b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
index 76b930040a33..24f8aa69ca2e 100644
--- a/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
+++ b/metadata/md5-cache/dev-ruby/dust-0.1.7-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/dust-0.1.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dca5b97000b450f217b727475ab5a1aa
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.11 b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
index a873924a0a08..6da5b267220e 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.11
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/equalizer-0.0.11.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=258af92fe527030628d37f8cfb4a12ec
diff --git a/metadata/md5-cache/dev-ruby/equalizer-0.0.9 b/metadata/md5-cache/dev-ruby/equalizer-0.0.9
index 205e2fe06fe5..22179d0dedd5 100644
--- a/metadata/md5-cache/dev-ruby/equalizer-0.0.9
+++ b/metadata/md5-cache/dev-ruby/equalizer-0.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/equalizer-0.0.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a885899d93fad8adc2a1c943762d7b5e
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r1 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r1
index 52e715c98785..cc28f9fa8f6d 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/abstract-1.0.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/erubis-2.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a5f1e5f3001a8843af4987c69522948
diff --git a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2 b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
index 2ffae11a74f0..c883e8c3a702 100644
--- a/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
+++ b/metadata/md5-cache/dev-ruby/erubis-2.7.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/erubis-2.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=757e796e1d42d44babfff91f00fe5d6f
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.1.0 b/metadata/md5-cache/dev-ruby/escape_utils-1.1.0
index 66105e5f88bb..644517598b21 100644
--- a/metadata/md5-cache/dev-ruby/escape_utils-1.1.0
+++ b/metadata/md5-cache/dev-ruby/escape_utils-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/escape_utils-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb943e6b4d8d4d3c8cff0e18f92c2f41
diff --git a/metadata/md5-cache/dev-ruby/escape_utils-1.2.0 b/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
index a85bdc25f4be..79624b763813 100644
--- a/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
+++ b/metadata/md5-cache/dev-ruby/escape_utils-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/escape_utils-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7720fba87720b8034aa50a65fe0481a
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.7.4 b/metadata/md5-cache/dev-ruby/ethon-0.7.4
index 77a92767759b..0e3d0f8106ca 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.7.4
+++ b/metadata/md5-cache/dev-ruby/ethon-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby19? ( >=dev-ruby/ffi-1.3.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ethon-0.7.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4ea18a1dcac37782eb2a2e084023475
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.8.0-r1 b/metadata/md5-cache/dev-ruby/ethon-0.8.0-r1
index 9b472e78093d..5d12e7070286 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/ethon-0.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby20? ( >=dev-ruby/ffi-1.3.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ethon-0.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=457fb1b1fd8c99802b887ea01828e423
diff --git a/metadata/md5-cache/dev-ruby/ethon-0.8.1 b/metadata/md5-cache/dev-ruby/ethon-0.8.1
index 788408e1356f..27b7a47a397f 100644
--- a/metadata/md5-cache/dev-ruby/ethon-0.8.1
+++ b/metadata/md5-cache/dev-ruby/ethon-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby20? ( >=dev-ruby/ffi-1.3.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ethon-0.8.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a91d32c0166e67f8b0b20d0450792e53
diff --git a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0 b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
index 6912d3b46506..b3cbc1aeaeb4 100644
--- a/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
+++ b/metadata/md5-cache/dev-ruby/evented-spec-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/evented-spec-0.9.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b0dd48cb048e63cb6161ee306557cdf
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
index 8c605f20644c..ef269271b598 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/eventmachine-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=919941b5ffc40fc74b0d758ad8f32de6
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.8 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.8
index 7d57e9029a4c..45dca921c311 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.8
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/eventmachine-1.0.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c7193a0d41d75dcb7e2c720ab62698e
diff --git a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1 b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
index 7716532158a4..5f809c044776 100644
--- a/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
+++ b/metadata/md5-cache/dev-ruby/eventmachine-1.0.9.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/eventmachine-1.0.9.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7bc05502129cca7dbd9ac5a273c1523
diff --git a/metadata/md5-cache/dev-ruby/execjs-1.4.0 b/metadata/md5-cache/dev-ruby/execjs-1.4.0
index e16ee3bb6e13..3530f083b2cb 100644
--- a/metadata/md5-cache/dev-ruby/execjs-1.4.0
+++ b/metadata/md5-cache/dev-ruby/execjs-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/sstephenson/execjs/tarball/v1.4.0 -> execjs-1.4.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=71aca2736149d28765f9db68d0b3fdd8
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.2.2 b/metadata/md5-cache/dev-ruby/execjs-2.2.2
index 6152686c7df5..ea72c97d35d6 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.2.2
+++ b/metadata/md5-cache/dev-ruby/execjs-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sstephenson/execjs/archive/v2.2.2.tar.gz -> execjs-2.2.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6908ed4a909198d8c18e7bf248505f81
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.5.2 b/metadata/md5-cache/dev-ruby/execjs-2.5.2
index 1a2b5a0479ab..aa8c712d3cd3 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.5.2
+++ b/metadata/md5-cache/dev-ruby/execjs-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.5.2.tar.gz -> execjs-2.5.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50d05e03d25b4870fa46700e548f3417
diff --git a/metadata/md5-cache/dev-ruby/execjs-2.6.0 b/metadata/md5-cache/dev-ruby/execjs-2.6.0
index 771330c30905..7ee2084209dc 100644
--- a/metadata/md5-cache/dev-ruby/execjs-2.6.0
+++ b/metadata/md5-cache/dev-ruby/execjs-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rails/execjs/archive/v2.6.0.tar.gz -> execjs-2.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c797a819e1dfd1c566ec897474903c66
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.3.1 b/metadata/md5-cache/dev-ruby/exifr-1.2.3.1
index 0990b907c1ab..d3e88b793521 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.3.1
+++ b/metadata/md5-cache/dev-ruby/exifr-1.2.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.2.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4cae735449ebd9b65025defa06281777
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.4 b/metadata/md5-cache/dev-ruby/exifr-1.2.4
index 33e57c3954b1..26fe93347098 100644
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.4
+++ b/metadata/md5-cache/dev-ruby/exifr-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/exifr-1.2.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e7e92b44bff2dc72d6857a91cea905
diff --git a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518 b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
index 223b778db0e4..eb2c3868b46a 100644
--- a/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
+++ b/metadata/md5-cache/dev-ruby/expression_parser-0.9.0_p20130518
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/expression_parser/archive/6e3c7973423ff0f2cd33db2304fcd4eac3af01ad.tar.gz -> expression_parser-0.9.0_p20130518.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27da5fe2e110322570b4c93e2edb2e4c
diff --git a/metadata/md5-cache/dev-ruby/extlib-0.9.16-r1 b/metadata/md5-cache/dev-ruby/extlib-0.9.16-r1
index aec54c8669e1..cf88afab009a 100644
--- a/metadata/md5-cache/dev-ruby/extlib-0.9.16-r1
+++ b/metadata/md5-cache/dev-ruby/extlib-0.9.16-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/extlib-0.9.16.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33a0871d6e96944e2186344faad1f4c6
diff --git a/metadata/md5-cache/dev-ruby/facets-2.9.3 b/metadata/md5-cache/dev-ruby/facets-2.9.3
index c4fb298cbe1c..0c7a91ab087a 100644
--- a/metadata/md5-cache/dev-ruby/facets-2.9.3
+++ b/metadata/md5-cache/dev-ruby/facets-2.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/facets-2.9.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b65048c4d6f93f97fc225664d8d5276
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.1 b/metadata/md5-cache/dev-ruby/facter-2.4.1
index df96015791b1..1b8e10f7beeb 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.1
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-2.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d0ddbf2aa56a4e80b66c4221a3fd4273
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 804a6a386171..c0fbb08beb02 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-2.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b19658667286c263a27814cb11e8c96
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.3 b/metadata/md5-cache/dev-ruby/facter-2.4.3
index 3a09b1ee4f4f..d1a6363e3876 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.3
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4cb2def56fb7cdc9f794f2a54c3432a5
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.4 b/metadata/md5-cache/dev-ruby/facter-2.4.4
index c813fdd40b56..305a2af03072 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.4
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.4
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4cb2def56fb7cdc9f794f2a54c3432a5
diff --git a/metadata/md5-cache/dev-ruby/facter-2.4.6 b/metadata/md5-cache/dev-ruby/facter-2.4.6
index f44376000564..4e2b188ae62e 100644
--- a/metadata/md5-cache/dev-ruby/facter-2.4.6
+++ b/metadata/md5-cache/dev-ruby/facter-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=app-emulation/virt-what sys-apps/net-tools sys-apps/lsb-release dmi? ( s
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/facter-2.4.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _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 f82f8e4ab707..5421bece72ae 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/facter-3.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54 >=dev-cpp/yaml-cpp-0.5.1 dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee95e29e58f4149c4f2f96e544f0d23f
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.2 b/metadata/md5-cache/dev-ruby/facter-3.1.2
index 1c2ac2cfa122..0b0d16d143ea 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.2
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3aed1a8c01bddc6c7b08ad78ac093181
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.3 b/metadata/md5-cache/dev-ruby/facter-3.1.3
index b350bed9a808..d86ebced05bf 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.3
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3aed1a8c01bddc6c7b08ad78ac093181
diff --git a/metadata/md5-cache/dev-ruby/facter-3.1.4-r1 b/metadata/md5-cache/dev-ruby/facter-3.1.4-r1
index 314618cbe96f..230db75ad82b 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/facter-3.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] >=dev-cpp/yaml-cpp-0.5.
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/facter/facter-3.1.4.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef605b82b00f427ab1fedd8fb85641ed
diff --git a/metadata/md5-cache/dev-ruby/factory_girl-4.5.0 b/metadata/md5-cache/dev-ruby/factory_girl-4.5.0
index 43b4ef1fc86b..5914c5c25406 100644
--- a/metadata/md5-cache/dev-ruby/factory_girl-4.5.0
+++ b/metadata/md5-cache/dev-ruby/factory_girl-4.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/factory_girl-4.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b53e28c3a1316c88127ca9021af1947b
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.0 b/metadata/md5-cache/dev-ruby/fakefs-0.6.0
index fb113397a98e..33d2731c531a 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.0
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0dfcd656253c09bf8ff4f910752cb918
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1 b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
index 5bb9cb4acff8..29cfcac9515a 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d9d7e3ab63201641471073506b22cb2
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.5 b/metadata/md5-cache/dev-ruby/fakefs-0.6.5
index 2ca0b8ecbe4a..689ca4725950 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.5
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=13fdf0043d4f8f66deea6c9f9965f900
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.6.7 b/metadata/md5-cache/dev-ruby/fakefs-0.6.7
index 42a502480639..dd1b6994f4d2 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.6.7
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.6.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.6.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5107fda45539c12700265051fbfbaac3
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.7.0 b/metadata/md5-cache/dev-ruby/fakefs-0.7.0
index 080d70c9b083..dd6c8538cae6 100644
--- a/metadata/md5-cache/dev-ruby/fakefs-0.7.0
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakefs-0.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e13a8155b76d71e02dec3767f10ac51
diff --git a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r1 b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r1
index 5dde54ac1886..3217b35a7bbe 100644
--- a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakeweb-1.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f89154eba515c2c6da2dc51ffb9d174f
diff --git a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2 b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
index e34873a5673b..f9687b7ec8c6 100644
--- a/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
+++ b/metadata/md5-cache/dev-ruby/fakeweb-1.3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/fakeweb-1.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f872d5cb7bef72af813ee65cc2abbb64
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.0 b/metadata/md5-cache/dev-ruby/faraday-0.9.0
index 76abbc409ae4..7f55090928a0 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.0
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.0.tar.gz -> faraday-0.9.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=03b88f8420426c54d2421f312079f2c7
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.1 b/metadata/md5-cache/dev-ruby/faraday-0.9.1
index 1129b4e86d51..b76473740aa3 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.1
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.1.tar.gz -> faraday-0.9.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=491590b6d790ec25c0e4470ad6cebdf6
diff --git a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1 b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
index be0a21cf6df0..dc35bc5c4498 100644
--- a/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/faraday-0.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/multipart-post-1.2.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday/archive/v0.9.2.tar.gz -> faraday-0.9.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bbd9f7de3765e30ab7ea521c164d53b6
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
index ebad069a8f07..ffdba3353631 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby19] <de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.10.0.tar.gz -> faraday_middleware-0.10.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1aeea024c59dfe53c0c79c3bde1a386
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-0.9.2 b/metadata/md5-cache/dev-ruby/faraday_middleware-0.9.2
index 9c65a895bae2..d893a6ee9e25 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-0.9.2
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/faraday-0.7.4[ruby_targets_ruby19] <de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/lostisland/faraday_middleware/archive/v0.9.2.tar.gz -> faraday_middleware-0.9.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae556ac210c9eba9182a23bc34c4f119
diff --git a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6 b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
index 459cfc1b4e01..beabbbe75dd1 100644
--- a/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
+++ b/metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/faraday_middleware[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/denro/faraday_middleware-multi_json/archive/v0.0.6.tar.gz -> faraday_middleware-multi_json-0.0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65cbc20e6d4ddd81ad63e012b173d98f
diff --git a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2 b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
index 310c6205e9c6..ec1eec0dda0e 100644
--- a/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast-stemmer-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a2133916d30f2f8b33a6a01350ecad46
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-1.0.0 b/metadata/md5-cache/dev-ruby/fast_gettext-1.0.0
index de79d0572ae3..a7517fe2a1fe 100644
--- a/metadata/md5-cache/dev-ruby/fast_gettext-1.0.0
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/fast_gettext/archive/v1.0.0.tar.gz -> fast_gettext-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4425490e9ee597384d4337ac695a64f8
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
index 00ea21f8d4de..00eb3a237086 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast_xs-0.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2312eabd4da3d1fc66dadf95b66ea1f
diff --git a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2 b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
index 5f8d090bc592..ed7782e5aba0 100644
--- a/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
+++ b/metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fast_xs-0.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4472c8289f2800bcb4765c0fd077f7d
diff --git a/metadata/md5-cache/dev-ruby/fattr-2.2.2 b/metadata/md5-cache/dev-ruby/fattr-2.2.2
index 57a3072e4519..9501e9e831d9 100644
--- a/metadata/md5-cache/dev-ruby/fattr-2.2.2
+++ b/metadata/md5-cache/dev-ruby/fattr-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fattr-2.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e33f21c456cfc8029f804a52a003ebd5
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1
index de9ad50fe37f..831307c7903e 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/fcgi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/fcgi-0.9.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8a717ce933bfc4def0d5bd8d6d71353e
diff --git a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1 b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
index 87631a00cc8d..deb4399a789e 100644
--- a/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/fcgi-0.9.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/fcgi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fcgi-0.9.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a90706c5f0b12bdd3a550041f43c4bd8
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.5-r2 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.5-r2
index f3c987ff88b2..0689857449a5 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.5-r2
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.5-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fda8e061f16808ca725f8a52ba3ee0cb
diff --git a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6 b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
index 04ecea67aa61..8f41a8379342 100644
--- a/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
+++ b/metadata/md5-cache/dev-ruby/ferret-0.11.8.6
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ferret-0.11.8.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=43307e248773271573a4ade939f93947
diff --git a/metadata/md5-cache/dev-ruby/ffaker-2.1.0 b/metadata/md5-cache/dev-ruby/ffaker-2.1.0
index 53371e14460b..8ad7841a7d42 100644
--- a/metadata/md5-cache/dev-ruby/ffaker-2.1.0
+++ b/metadata/md5-cache/dev-ruby/ffaker-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ffaker-2.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cba8cc1a31f3b16b545ccedf396d9fd6
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.10 b/metadata/md5-cache/dev-ruby/ffi-1.9.10
index 42d822c7a9f4..93992542148d 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.10
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.10
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.10.tar.gz -> ffi-git-1.9.10.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9be807753e06e7ed411e80f0ecaced41
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1 b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
index 181a76bd77cb..8240c69e16ea 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.9.6.tar.gz -> ffi-git-1.9.6.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6328fadc93a50fa1bd5061fd712db56a
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2 b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
index fc8d1380d004..f8bd6facda21 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.6-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/v1.9.6.tar.gz -> ffi-git-1.9.6.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea9e50d42f2ac515796b020f05e57988
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.8 b/metadata/md5-cache/dev-ruby/ffi-1.9.8
index c4c5e83eaeb6..5f0e4c00863e 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.8
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.8
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.8.tar.gz -> ffi-git-1.9.8.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=25e1a1d79fd35dd6ab165819578f8c81
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.9 b/metadata/md5-cache/dev-ruby/ffi-1.9.9
index 2d173db05eba..26c605836ac0 100644
--- a/metadata/md5-cache/dev-ruby/ffi-1.9.9
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.9
@@ -10,5 +10,5 @@ RDEPEND=virtual/libffi ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ffi/ffi/archive/1.9.9.tar.gz -> ffi-git-1.9.9.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c27c76d0b80effb2e07b695f7a43c0a
diff --git a/metadata/md5-cache/dev-ruby/file-tail-1.1.0 b/metadata/md5-cache/dev-ruby/file-tail-1.1.0
index 9ab195a732af..62c411da1d45 100644
--- a/metadata/md5-cache/dev-ruby/file-tail-1.1.0
+++ b/metadata/md5-cache/dev-ruby/file-tail-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/tins-1*[ruby_targets_ruby20] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/file-tail-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb96f0fae2608b2aa1811781cba1e35a
diff --git a/metadata/md5-cache/dev-ruby/filesize-0.1.1 b/metadata/md5-cache/dev-ruby/filesize-0.1.1
index e25e99ed9249..66e90887aad8 100644
--- a/metadata/md5-cache/dev-ruby/filesize-0.1.1
+++ b/metadata/md5-cache/dev-ruby/filesize-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.1.1
 SRC_URI=mirror://rubygems/filesize-0.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f41991eddee23dceffc0e294909ef28
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.1 b/metadata/md5-cache/dev-ruby/fivemat-1.3.1
index 401e40c4bca9..bf922ed50107 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.1
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fivemat-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4fe13cc13bc9394367a3db92574826f5
diff --git a/metadata/md5-cache/dev-ruby/fivemat-1.3.2 b/metadata/md5-cache/dev-ruby/fivemat-1.3.2
index 8e78d64cb115..b98847610829 100644
--- a/metadata/md5-cache/dev-ruby/fivemat-1.3.2
+++ b/metadata/md5-cache/dev-ruby/fivemat-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/fivemat-1.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4fe13cc13bc9394367a3db92574826f5
diff --git a/metadata/md5-cache/dev-ruby/flexmock-1.3.3 b/metadata/md5-cache/dev-ruby/flexmock-1.3.3
index 54c8634dcbbe..c00cd94c33f7 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-1.3.3
+++ b/metadata/md5-cache/dev-ruby/flexmock-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/flexmock-1.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9951b69071feb00a125d5744acabb45d
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 7fddf188a252..cfdfc4f7e5e3 100644
--- a/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/flexmock-1.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/flexmock-1.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a010f953f59e2c996160b8cfb83ef552
diff --git a/metadata/md5-cache/dev-ruby/flickraw-0.9.8 b/metadata/md5-cache/dev-ruby/flickraw-0.9.8
index ce3effc6bb9f..04be4b7ad438 100644
--- a/metadata/md5-cache/dev-ruby/flickraw-0.9.8
+++ b/metadata/md5-cache/dev-ruby/flickraw-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/flickraw-0.9.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=341c29f730c49af017d055783987dca6
diff --git a/metadata/md5-cache/dev-ruby/flog-4.3.2 b/metadata/md5-cache/dev-ruby/flog-4.3.2
index cc7412a6c3c7..70d8afb8e1cb 100644
--- a/metadata/md5-cache/dev-ruby/flog-4.3.2
+++ b/metadata/md5-cache/dev-ruby/flog-4.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >dev-ruby/ruby_parser-3.1.0:3[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/flog-4.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=249909dc8f1bfd300e0f4a66c0e0771b
diff --git a/metadata/md5-cache/dev-ruby/forgery-0.6.0 b/metadata/md5-cache/dev-ruby/forgery-0.6.0
index e4ae0597b42d..031d41910eff 100644
--- a/metadata/md5-cache/dev-ruby/forgery-0.6.0
+++ b/metadata/md5-cache/dev-ruby/forgery-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sevenwire/forgery/archive/v0.6.0.tar.gz -> forgery-0.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=751440fcf8527effd2a2bbe4eaac5e86
diff --git a/metadata/md5-cache/dev-ruby/fuubar-2.0.0 b/metadata/md5-cache/dev-ruby/fuubar-2.0.0
index 3f2359b61374..b12543f4b5b3 100644
--- a/metadata/md5-cache/dev-ruby/fuubar-2.0.0
+++ b/metadata/md5-cache/dev-ruby/fuubar-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rspec:3[ruby_targets_ruby19] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/fuubar-2.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75566c3e8426d6ae1971a3d63df063e9
diff --git a/metadata/md5-cache/dev-ruby/fxruby-1.6.29 b/metadata/md5-cache/dev-ruby/fxruby-1.6.29
index 5ca2309d1d1b..ab1f18114f0b 100644
--- a/metadata/md5-cache/dev-ruby/fxruby-1.6.29
+++ b/metadata/md5-cache/dev-ruby/fxruby-1.6.29
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 ruby_targets_ruby19? ( d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/fxruby-1.6.29.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=20f0e44f0cded37b20f03bf07566724a
diff --git a/metadata/md5-cache/dev-ruby/fxruby-1.6.29-r1 b/metadata/md5-cache/dev-ruby/fxruby-1.6.29-r1
index 0b17efb88393..d54d0e0f71e3 100644
--- a/metadata/md5-cache/dev-ruby/fxruby-1.6.29-r1
+++ b/metadata/md5-cache/dev-ruby/fxruby-1.6.29-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/fox:1.6 >=x11-libs/fxscintilla-1.62-r1 ruby_targets_ruby19? ( d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/fxruby-1.6.29.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=20f244f4231c73eecb5eb3d6b745d579
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.3.1 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.3.1
index ed4f4d227c60..20bce8a0b5bf 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.3.1
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.3.1.tar.gz -> gettext_i18n_rails-1.3.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e362202691095f98d4ac745dc89ead2a
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.3.2 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.3.2
index 70978ae45bb0..d1a6311c71a5 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.3.2
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.3.2.tar.gz -> gettext_i18n_rails-1.3.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cda43edb002d661c4f78c4dd584668ea
diff --git a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.4.0 b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.4.0
index e06db6c2b2cf..6940bbe955e3 100644
--- a/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.4.0
+++ b/metadata/md5-cache/dev-ruby/gettext_i18n_rails-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/fast_gettext-0.9.0[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/grosser/gettext_i18n_rails/archive/v1.4.0.tar.gz -> gettext_i18n_rails-1.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=094836a3bcc303567cdaa160d9781a73
diff --git a/metadata/md5-cache/dev-ruby/gh-0.14.0 b/metadata/md5-cache/dev-ruby/gh-0.14.0
index b0479eb79642..b6b4c857b386 100644
--- a/metadata/md5-cache/dev-ruby/gh-0.14.0
+++ b/metadata/md5-cache/dev-ruby/gh-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/gh-0.14.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=528811d859a7b6c8739cea27b1d7af7a
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 969757dac834..85a9c69ad779 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e70ade55dd2ab611215f3291e541c4
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 d05b4c5a3d3d..3dcd31607214 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8a99850c8888787e46a99155b93a9c4
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.2 b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
index 7225e3352a6d..ff242694d864 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.2
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08c8616f4d8dd0e750cb2dda53b61380
diff --git a/metadata/md5-cache/dev-ruby/gherkin3-3.1.2 b/metadata/md5-cache/dev-ruby/gherkin3-3.1.2
index 9919aa588da2..c6dc92b6a603 100644
--- a/metadata/md5-cache/dev-ruby/gherkin3-3.1.2
+++ b/metadata/md5-cache/dev-ruby/gherkin3-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/gherkin3-3.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=667495bfd76be04747d8ad6a3db71328
diff --git a/metadata/md5-cache/dev-ruby/git-1.2.9.1 b/metadata/md5-cache/dev-ruby/git-1.2.9.1
index fed4a540144f..dc515f042c6e 100644
--- a/metadata/md5-cache/dev-ruby/git-1.2.9.1
+++ b/metadata/md5-cache/dev-ruby/git-1.2.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.2.9.1.tar.gz -> git-1.2.9.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02c008d65ca3a07b80d57ba9f6c1c886
diff --git a/metadata/md5-cache/dev-ruby/git-1.2.9.1-r1 b/metadata/md5-cache/dev-ruby/git-1.2.9.1-r1
index 0df4b8149770..66b6d7c65281 100644
--- a/metadata/md5-cache/dev-ruby/git-1.2.9.1-r1
+++ b/metadata/md5-cache/dev-ruby/git-1.2.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-vcs/git-1.6.0.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/schacon/ruby-git/archive/v1.2.9.1.tar.gz -> git-1.2.9.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f2ecf1a2b7eab26492503701c14352b
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.11.3 b/metadata/md5-cache/dev-ruby/github_api-0.11.3
index 91dd1be3a39d..a43141c4410f 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.11.3
+++ b/metadata/md5-cache/dev-ruby/github_api-0.11.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/github_api-0.11.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=653365aacb8e44d934d8cb5894bbce68
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.11.3-r1 b/metadata/md5-cache/dev-ruby/github_api-0.11.3-r1
index 2596fed8cab7..f75bbc760e4e 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.11.3-r1
+++ b/metadata/md5-cache/dev-ruby/github_api-0.11.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/github_api-0.11.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef81d43dd278a78de42ec629b5071fbc
diff --git a/metadata/md5-cache/dev-ruby/github_api-0.12.4 b/metadata/md5-cache/dev-ruby/github_api-0.12.4
index b503d7c14c11..0d415e12db23 100644
--- a/metadata/md5-cache/dev-ruby/github_api-0.12.4
+++ b/metadata/md5-cache/dev-ruby/github_api-0.12.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/peter-murach/github/archive/v0.12.4.tar.gz -> github_api-0.12.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09d763fdff3e92cf1add4e4b94e4b990
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.3 b/metadata/md5-cache/dev-ruby/globalid-0.3.3
index 47f6725e5763..2ef79b3ec721 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.3
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-4.1.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.3.tar.gz -> globalid-0.3.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=922bd91cbe4dd0aa64e1f4e0a40ea779
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.5 b/metadata/md5-cache/dev-ruby/globalid-0.3.5
index afd249e3e0f1..0c53cc615279 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.5
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.5.tar.gz -> globalid-0.3.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f29a0c903b0f3ea96c580a982273bb7
diff --git a/metadata/md5-cache/dev-ruby/globalid-0.3.6 b/metadata/md5-cache/dev-ruby/globalid-0.3.6
index ec0883d7b288..359d0bc50640 100644
--- a/metadata/md5-cache/dev-ruby/globalid-0.3.6
+++ b/metadata/md5-cache/dev-ruby/globalid-0.3.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.1.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rails/globalid/archive/v0.3.6.tar.gz -> globalid-0.3.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b84ff667f5d87b126be389f1f7530364
diff --git a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2 b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
index ce26a7005ca9..f9083a2e32b6 100644
--- a/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
+++ b/metadata/md5-cache/dev-ruby/gnuplot-2.6.2-r2
@@ -10,5 +10,5 @@ RDEPEND=sci-visualization/gnuplot ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/gnuplot-2.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b58c301c825dfba4cbbeeae6dd215cc
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.10 b/metadata/md5-cache/dev-ruby/gpgme-2.0.10
index ef1eca510cca..d74911eb4584 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.10
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.10
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/2.0.10.tar.gz -> ruby-gpgme-2.0.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e958d3bb57faf2d8eac1bff5d154d139
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.11 b/metadata/md5-cache/dev-ruby/gpgme-2.0.11
index 01e8e0091cf6..de763e53e3e4 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.11
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.11
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) || ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/2.0.11.tar.gz -> ruby-gpgme-2.0.11.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e62ae2ab89f2b720ebef9bc2f3103b8b
diff --git a/metadata/md5-cache/dev-ruby/gpgme-2.0.12 b/metadata/md5-cache/dev-ruby/gpgme-2.0.12
index ee230aeff2ee..2b4b6b277f95 100644
--- a/metadata/md5-cache/dev-ruby/gpgme-2.0.12
+++ b/metadata/md5-cache/dev-ruby/gpgme-2.0.12
@@ -10,5 +10,5 @@ RDEPEND=>=app-crypt/gpgme-1.1.3 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) || ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ueno/ruby-gpgme/archive/2.0.12.tar.gz -> ruby-gpgme-2.0.12.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47af59874b4a996b4000745160cc3435
diff --git a/metadata/md5-cache/dev-ruby/gruff-0.6.0 b/metadata/md5-cache/dev-ruby/gruff-0.6.0
index c79aecde1479..1d3b519e66be 100644
--- a/metadata/md5-cache/dev-ruby/gruff-0.6.0
+++ b/metadata/md5-cache/dev-ruby/gruff-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick[truetype] ruby_targets_ruby19? ( >=dev-ruby/rmagic
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gruff-0.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=668abde63f2bfa193b0603e8e2245fca
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.6 b/metadata/md5-cache/dev-ruby/haml-4.0.6
index 2a320ee75b2d..8213ef93f03a 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.6
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.6
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d581ff26783fafda05680a736e84e8a7
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.6-r1 b/metadata/md5-cache/dev-ruby/haml-4.0.6-r1
index 570b4f4265bb..e328734b53f5 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby19? ( dev-ruby/tilt[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=783e1c2c86879a5c27f0d3660893b37c
diff --git a/metadata/md5-cache/dev-ruby/haml-4.0.7 b/metadata/md5-cache/dev-ruby/haml-4.0.7
index f0763c77a8e1..f3e2b90470d9 100644
--- a/metadata/md5-cache/dev-ruby/haml-4.0.7
+++ b/metadata/md5-cache/dev-ruby/haml-4.0.7
@@ -10,5 +10,5 @@ RDEPEND=!!<dev-ruby/haml-3.1.8-r2 ruby_targets_ruby20? ( dev-ruby/tilt:*[ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/haml-4.0.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edad7e2c020e6783d76a6dd64fa9e693
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.2.2 b/metadata/md5-cache/dev-ruby/hashdiff-0.2.2
index 7e9874cc129c..0b2017f8cc3b 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.2.2
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashdiff-0.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52d59e83b2bb925f684e59843b8e1136
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.2.3 b/metadata/md5-cache/dev-ruby/hashdiff-0.2.3
index 3dff91b00168..a44463430d36 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.2.3
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashdiff-0.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=14655de904621f254b70be50f905e11d
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.0 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.0
index dfa2fd43bfa8..d23797fa6104 100644
--- a/metadata/md5-cache/dev-ruby/hashdiff-0.3.0
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashdiff-0.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=903ef9c3abdf2f973a79196a9c0bccb3
diff --git a/metadata/md5-cache/dev-ruby/hashery-2.1.1 b/metadata/md5-cache/dev-ruby/hashery-2.1.1
index 63828a69843b..632ed318b694 100644
--- a/metadata/md5-cache/dev-ruby/hashery-2.1.1
+++ b/metadata/md5-cache/dev-ruby/hashery-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashery-2.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53bd5ac287db631ed3e92241a6c51ee5
diff --git a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4 b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4
index a32ae7c7eb04..c49252aa7c93 100644
--- a/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4
+++ b/metadata/md5-cache/dev-ruby/hashicorp-checkpoint-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashicorp-checkpoint-0.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb6d104212e374a4fe8f7b1b2b6fcbd2
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2 b/metadata/md5-cache/dev-ruby/hashie-2.1.2
index 3c01caaa93cb..b7542c895ab4 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashie-2.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65b75ce02d9807ac03e32126d17f1349
diff --git a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1 b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
index 5085cb2226f8..43f7a2c026c6 100644
--- a/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/hashie-2.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashie-2.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5975b48872628154c426602c5b9fac7
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.4.2 b/metadata/md5-cache/dev-ruby/hashie-3.4.2
index cee4a68ba35f..c3d1855bc330 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.4.2
+++ b/metadata/md5-cache/dev-ruby/hashie-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b7632829128d61269f063cafdd36b3f
diff --git a/metadata/md5-cache/dev-ruby/hashie-3.4.3 b/metadata/md5-cache/dev-ruby/hashie-3.4.3
index be8f86847002..3a29ed6be141 100644
--- a/metadata/md5-cache/dev-ruby/hashie-3.4.3
+++ b/metadata/md5-cache/dev-ruby/hashie-3.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/hashie-3.4.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ddddd67692ce2bf34fd6afa297635ffe
diff --git a/metadata/md5-cache/dev-ruby/hashr-0.0.22 b/metadata/md5-cache/dev-ruby/hashr-0.0.22
index 6237599052a2..21e7a67cf2df 100644
--- a/metadata/md5-cache/dev-ruby/hashr-0.0.22
+++ b/metadata/md5-cache/dev-ruby/hashr-0.0.22
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashr-0.0.22.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60b8e5dd1f351d1951346791c13dd80b
diff --git a/metadata/md5-cache/dev-ruby/hashr-1.0.0 b/metadata/md5-cache/dev-ruby/hashr-1.0.0
index b49dff5cd385..e9d7169e7496 100644
--- a/metadata/md5-cache/dev-ruby/hashr-1.0.0
+++ b/metadata/md5-cache/dev-ruby/hashr-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashr-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60b8e5dd1f351d1951346791c13dd80b
diff --git a/metadata/md5-cache/dev-ruby/hashr-2.0.0 b/metadata/md5-cache/dev-ruby/hashr-2.0.0
index 3da21b8f8465..b426bb48d462 100644
--- a/metadata/md5-cache/dev-ruby/hashr-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hashr-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hashr-2.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df0802e07eabc027d008dcb64e0d407a
diff --git a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0 b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
index 1e3931133bfe..7222ffdfa243 100644
--- a/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
+++ b/metadata/md5-cache/dev-ruby/heredoc_unindent-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/heredoc_unindent-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a5108bafb2a446ae249f97cf184f8ad
diff --git a/metadata/md5-cache/dev-ruby/hiera-1.3.4 b/metadata/md5-cache/dev-ruby/hiera-1.3.4
index 2ec071548843..1f5de0a1ded9 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-1.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff3a3c98d52be0016706cfa988ab20aa
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 9e0bc1104448..a27f87957303 100644
--- a/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-1.3.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-1.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d509c17e984b74ff4286ecd9d9cd415d
diff --git a/metadata/md5-cache/dev-ruby/hiera-2.0.0 b/metadata/md5-cache/dev-ruby/hiera-2.0.0
index b4431596689d..f4f22ba87888 100644
--- a/metadata/md5-cache/dev-ruby/hiera-2.0.0
+++ b/metadata/md5-cache/dev-ruby/hiera-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5bdc575eae7358dc192a0e240c0fedff
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 775e45456ebf..313a1ac2840e 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/hiera-3.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] dev-ruby/deep_
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf332cda26cde537edb2bc959529b9d8
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.0.5 b/metadata/md5-cache/dev-ruby/hiera-3.0.5
index 0090cfad7b5e..c5db6b3f560a 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.0.5
+++ b/metadata/md5-cache/dev-ruby/hiera-3.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/deep_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-3.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7fdad23a5a463f7f188d7026b3674272
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.0.6 b/metadata/md5-cache/dev-ruby/hiera-3.0.6
index aa8e7ce545fe..cbd9d6a931c4 100644
--- a/metadata/md5-cache/dev-ruby/hiera-3.0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/deep_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-3.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c946dec2d636532ec9cddb463c2b38a
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.6
index 76ac454647c0..d9527b9f738e 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/highline[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-2.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eab6d12b36eedf7405a77ef8b6eddac0
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.7 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.7
index a98819b6dc88..cf494f296f5d 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.7
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v2.0.7.tar.gz -> hiera-eyaml-2.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84dcacbc1f4c42db52abe50ed5700935
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.8 b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.8
index 9bed4b9cebbd..335b5f40c8a7 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.8
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.6.19[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v2.0.8.tar.gz -> hiera-eyaml-2.0.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84dcacbc1f4c42db52abe50ed5700935
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 5ab22c913923..6bfc349ce09e 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ace531c877a1b1401310ae6420acc3e
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 3e00e0717c53..fc037a95e09a 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3391e07de5a5cf08dd47e319b7ea754
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 28ac0cf43bb9..84be91e49d5a 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-gpg-0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hiera-eyaml-1.3.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-gpg-0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3391e07de5a5cf08dd47e319b7ea754
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6 b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
index 2a66c65600f5..9e7accedc523 100644
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
+++ b/metadata/md5-cache/dev-ruby/hiera-eyaml-plaintext-0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hiera-eyaml-plaintext-0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=976407f7b973901a95c5f99b5cb82e8c
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.6 b/metadata/md5-cache/dev-ruby/highline-1.7.6
index f881ba6e79e2..9597084b28e0 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.6
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2e415bd4f5681bad2cd752076265818
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.7 b/metadata/md5-cache/dev-ruby/highline-1.7.7
index 4b1abf8e3dcf..adec21dcf284 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.7
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e38fd55a475aaf65c0828338bd590f89
diff --git a/metadata/md5-cache/dev-ruby/highline-1.7.8 b/metadata/md5-cache/dev-ruby/highline-1.7.8
index 7bc55e103c04..dc31bb5a8413 100644
--- a/metadata/md5-cache/dev-ruby/highline-1.7.8
+++ b/metadata/md5-cache/dev-ruby/highline-1.7.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/highline-1.7.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e38fd55a475aaf65c0828338bd590f89
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3 b/metadata/md5-cache/dev-ruby/hike-1.2.3
index ec3e2beb1613..fdc9ad7dacbc 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96851a5634f171d46f18dd035cdad514
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 db7b3a982914..5bd1a45b2ee3 100644
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9f415d6decce1b4edec07f766d3fd64
diff --git a/metadata/md5-cache/dev-ruby/hike-2.1.2 b/metadata/md5-cache/dev-ruby/hike-2.1.2
index f7af249b2a44..3f33b5a13dd8 100644
--- a/metadata/md5-cache/dev-ruby/hike-2.1.2
+++ b/metadata/md5-cache/dev-ruby/hike-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38ab090cc073f5b095196cc5a6db8393
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.4.0 b/metadata/md5-cache/dev-ruby/hipchat-1.4.0
index da16f14e3aa3..50f2c9d2f21e 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.4.0
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/httparty[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.4.0.tar.gz -> hipchat-1.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b4926a2ee84bd85719d13081e8eecba
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.5.1 b/metadata/md5-cache/dev-ruby/hipchat-1.5.1
index b0cd1e6a99e9..0888d532897c 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.5.1
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/httparty[ruby_targets_ruby19] dev-ruby/m
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/hipchat/hipchat-rb/archive/v1.5.1.tar.gz -> hipchat-1.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=43a7194c462a7170cde4de5a124d4983
diff --git a/metadata/md5-cache/dev-ruby/hipchat-1.5.2 b/metadata/md5-cache/dev-ruby/hipchat-1.5.2
index e7ceb254e234..58403aae587c 100644
--- a/metadata/md5-cache/dev-ruby/hipchat-1.5.2
+++ b/metadata/md5-cache/dev-ruby/hipchat-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/httparty[ruby_targets_ruby19] dev-ruby/m
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bed31a44102024cb876cd4619f1ae62
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.2 b/metadata/md5-cache/dev-ruby/hitimes-1.2.2
index 39bee7b05598..b5ce54bb0ffb 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.2
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09b2456f45da6f42fcc115c0ed236bc6
diff --git a/metadata/md5-cache/dev-ruby/hitimes-1.2.3 b/metadata/md5-cache/dev-ruby/hitimes-1.2.3
index 3691d322aea4..30966cdd1023 100644
--- a/metadata/md5-cache/dev-ruby/hitimes-1.2.3
+++ b/metadata/md5-cache/dev-ruby/hitimes-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09b2456f45da6f42fcc115c0ed236bc6
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1 b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
index f35db319741c..059a0a4e24de 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.13.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.13.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fdb6f53df50f2bedc9f6daa678b4a5d
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.13.1 b/metadata/md5-cache/dev-ruby/hoe-3.13.1
index 8d0e72ac1325..5d92a050dac8 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.13.1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.13.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.13.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c2fc29ff63d5c22cb0d5e4222c078ea
diff --git a/metadata/md5-cache/dev-ruby/hoe-3.14.1 b/metadata/md5-cache/dev-ruby/hoe-3.14.1
index 5834a24e95bd..2a2b401652ff 100644
--- a/metadata/md5-cache/dev-ruby/hoe-3.14.1
+++ b/metadata/md5-cache/dev-ruby/hoe-3.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-3.14.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4647eec262366093acfc8a59a11a6628
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
index d19308da30f1..68063b080a48 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29a2a5af7aa5ca4253b6bdda7f198ceb
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.3 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.3
index 720e55f1e3cf..9d25ba178a52 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.3
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1cbf30d654bf3107c520c52c098cfef9
diff --git a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4 b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
index 4e4f22c7320f..5934deb4a715 100644
--- a/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
+++ b/metadata/md5-cache/dev-ruby/hoe-seattlerb-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-seattlerb-1.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53b2777cadb4e05749d6ff3c600489e8
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2
index fa2f809afb57..09203604de10 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/fast_xs[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/hpricot-0.8.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cbe0772397ace3faf015ce4855e169e2
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r3 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r3
index 2277140dc9c6..5079c2498b22 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r3
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/fast_xs[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/hpricot-0.8.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87587f87d572df1843485c111b7e1915
diff --git a/metadata/md5-cache/dev-ruby/html2haml-2.0.0 b/metadata/md5-cache/dev-ruby/html2haml-2.0.0
index 4dd866c6a78b..2abf07403e00 100644
--- a/metadata/md5-cache/dev-ruby/html2haml-2.0.0
+++ b/metadata/md5-cache/dev-ruby/html2haml-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6.0[ruby_targets_ruby20] >=
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/html2haml-2.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bdc7c841c97a3cc4d5c200a07bb41939
diff --git a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4 b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
index d61535a4b04f..23832bb93bb3 100644
--- a/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
+++ b/metadata/md5-cache/dev-ruby/htmlentities-4.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/htmlentities-4.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd0be68d25d838c47b67eeaf05b16e48
diff --git a/metadata/md5-cache/dev-ruby/http-0.6.3 b/metadata/md5-cache/dev-ruby/http-0.6.3
index 6a00a67e37fd..c6b3565bc090 100644
--- a/metadata/md5-cache/dev-ruby/http-0.6.3
+++ b/metadata/md5-cache/dev-ruby/http-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/http-0.6.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7bb768bfe1864ae30e4c4bb234007b2e
diff --git a/metadata/md5-cache/dev-ruby/http-0.6.3-r1 b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
index bef90153f245..a28c8e153335 100644
--- a/metadata/md5-cache/dev-ruby/http-0.6.3-r1
+++ b/metadata/md5-cache/dev-ruby/http-0.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http_parser_rb-0.6.0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/http-0.6.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6145340b139f7cb03912d6c2c538ec15
diff --git a/metadata/md5-cache/dev-ruby/http-0.9.8 b/metadata/md5-cache/dev-ruby/http-0.9.8
index 479bc59e648a..d45d410a505f 100644
--- a/metadata/md5-cache/dev-ruby/http-0.9.8
+++ b/metadata/md5-cache/dev-ruby/http-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/http-0.9.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c585480b2ae971ebb6a455f975598b42
diff --git a/metadata/md5-cache/dev-ruby/http-1.0.2 b/metadata/md5-cache/dev-ruby/http-1.0.2
index d40c7bf6761a..09c74d1fccd9 100644
--- a/metadata/md5-cache/dev-ruby/http-1.0.2
+++ b/metadata/md5-cache/dev-ruby/http-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/http-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcbb356791f66a7a37034c710274ba58
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
index 28d8d6a9a92f..25a807e785ab 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/http-cookie-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=771553a2526beb7f0d560a2b93fe308c
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 a39c99a4030d..d3b990d245e9 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
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7eb3fc33afdfcf5df79e1ee1a81ee9f4
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
index da865d9f9a24..2744906d8d2e 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5b0e95d4032e62b885c90a0cdf01498
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
index ace0a664b459..0279b3291ab3 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=430d353e15dac8811a88908d89d90b24
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.13.4 b/metadata/md5-cache/dev-ruby/httparty-0.13.4
index 5a34fba74a4f..406246338065 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.13.4
+++ b/metadata/md5-cache/dev-ruby/httparty-0.13.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/httparty-0.13.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c4959f626b6b2ae43538606d97490d2
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.13.5 b/metadata/md5-cache/dev-ruby/httparty-0.13.5
index 0a94728d5771..2b87277b0aa7 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.13.5
+++ b/metadata/md5-cache/dev-ruby/httparty-0.13.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/httparty-0.13.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d25f403b5b5d1ae64c00061948f28b1f
diff --git a/metadata/md5-cache/dev-ruby/httparty-0.13.7 b/metadata/md5-cache/dev-ruby/httparty-0.13.7
index cd1ba9e99b24..6c22234a0880 100644
--- a/metadata/md5-cache/dev-ruby/httparty-0.13.7
+++ b/metadata/md5-cache/dev-ruby/httparty-0.13.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.8:0[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/httparty-0.13.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be1a81691bac6c05344783e4d01914d6
diff --git a/metadata/md5-cache/dev-ruby/httpauth-0.2.1 b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
index e9f1416a977d..6cf98511b032 100644
--- a/metadata/md5-cache/dev-ruby/httpauth-0.2.1
+++ b/metadata/md5-cache/dev-ruby/httpauth-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/Manfred/HTTPauth/archive/v0.2.1.tar.gz -> httpauth-0.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1cbd3887282763b8840b025c4827b99b
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.6.0.1 b/metadata/md5-cache/dev-ruby/httpclient-2.6.0.1
index 85fd230ae6e2..7906cdf7addd 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.6.0.1
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.6.0.1
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.6.0.1.tar.gz -> httpclient-2.6.0.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec695aebec452bccb129fdf2d5efa45d
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.7.0.1 b/metadata/md5-cache/dev-ruby/httpclient-2.7.0.1
index b0ddf6bccb15..7544eae7f076 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.7.0.1
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.7.0.1
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.7.0.1.tar.gz -> httpclient-2.7.0.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e61b437168d8f57aa023b640d3e5e20a
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.7.1 b/metadata/md5-cache/dev-ruby/httpclient-2.7.1
index 91dbe96f683d..9c3f802a1743 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.7.1
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/http-access2 ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/nahi/httpclient/archive/v2.7.1.tar.gz -> httpclient-2.7.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e61b437168d8f57aa023b640d3e5e20a
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.6.11 b/metadata/md5-cache/dev-ruby/i18n-0.6.11
index 94f5ac97a5ea..6a623110ac34 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.6.11
+++ b/metadata/md5-cache/dev-ruby/i18n-0.6.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/i18n-0.6.11.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0fe727e76dbac727aa7db3749ccbdbf
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1 b/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
index ef54bf7fe000..2b5b63ef6fbb 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.6.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/i18n-0.6.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1168d234d1eadec4c1383de4bd7d5dff
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.7.0 b/metadata/md5-cache/dev-ruby/i18n-0.7.0
index 444b0a489650..d0c9fe3a1e82 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.7.0
+++ b/metadata/md5-cache/dev-ruby/i18n-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcf9e4f2bddbbec9dd87c829a5125f71
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r1 b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r1
index 881e94280450..5b1196f32391 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.7.0-r1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6950f31c6fa07f47bd43a38b3e8bf2f
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902
index 55b2a640b7a1..d7ebfae5c93f 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f67f00872a323b948facc229bf27c1b
diff --git a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1 b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
index 0789d4605bd8..8d0c9f4f766f 100644
--- a/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
+++ b/metadata/md5-cache/dev-ruby/imagesize-0.1.1_p20100902-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/mattheworiordan/imagesize/archive/bd5be2afb088beba3f0d863cef4eac7db56ca804.tar.gz -> imagesize-0.1.1_p20100902.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d050b9d64806d6ec3a898c6846fbbe49
diff --git a/metadata/md5-cache/dev-ruby/inifile-2.0.2-r1 b/metadata/md5-cache/dev-ruby/inifile-2.0.2-r1
index ab9494cc8a77..4a60a4cfdfa0 100644
--- a/metadata/md5-cache/dev-ruby/inifile-2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/inifile-2.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/inifile-2.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99877685f48bfa74306021ead301f1bd
diff --git a/metadata/md5-cache/dev-ruby/inifile-3.0.0 b/metadata/md5-cache/dev-ruby/inifile-3.0.0
index 6dacd8dde35b..8a7cbf9ad511 100644
--- a/metadata/md5-cache/dev-ruby/inifile-3.0.0
+++ b/metadata/md5-cache/dev-ruby/inifile-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/inifile-3.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a8fd6abd4a411215704d1592612d2beb
diff --git a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0 b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
index a60117e4d903..9e5354b0be3f 100644
--- a/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
+++ b/metadata/md5-cache/dev-ruby/instance_storage-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/instance_storage-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4a873152e39e743cf667d6b02803aa7
diff --git a/metadata/md5-cache/dev-ruby/instantiator-0.0.6 b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
index 0af50371b03b..5709cf7da3dc 100644
--- a/metadata/md5-cache/dev-ruby/instantiator-0.0.6
+++ b/metadata/md5-cache/dev-ruby/instantiator-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/blankslate[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/instantiator-0.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea5e5b97c42a803e40d95a879d8240d6
diff --git a/metadata/md5-cache/dev-ruby/introspection-0.0.3 b/metadata/md5-cache/dev-ruby/introspection-0.0.3
index fcb06f785b30..2f7db048374d 100644
--- a/metadata/md5-cache/dev-ruby/introspection-0.0.3
+++ b/metadata/md5-cache/dev-ruby/introspection-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/metaclass-0.0.1[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/introspection-0.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70b3b450228de8033239e5b1b6f9819a
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
index b8cd5290d167..393a193198ee 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=142cd35e2fc0537b1a894c4e787976fe
diff --git a/metadata/md5-cache/dev-ruby/itextomml-1.5.2 b/metadata/md5-cache/dev-ruby/itextomml-1.5.2
index d808b696bacc..cad7f54f9c26 100644
--- a/metadata/md5-cache/dev-ruby/itextomml-1.5.2
+++ b/metadata/md5-cache/dev-ruby/itextomml-1.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/itextomml-1.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=39502bf1c03c12575a681b112ca015fd
diff --git a/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2 b/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
index 7fc50e6950c5..ed17f8014336 100644
--- a/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/jeweler-2.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] >=dev-ruby/git
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/jeweler-2.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=164d19159cfbe33caad8035582adfc28
diff --git a/metadata/md5-cache/dev-ruby/jmespath-1.1.3 b/metadata/md5-cache/dev-ruby/jmespath-1.1.3
index 431993a050f6..62fb1d108548 100644
--- a/metadata/md5-cache/dev-ruby/jmespath-1.1.3
+++ b/metadata/md5-cache/dev-ruby/jmespath-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/jmespath/jmespath.rb/archive/v1.1.3.tar.gz -> jmespath-1.1.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=63e2c69c18ff58186359dd83ad7a4961
diff --git a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1 b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
index 03728265fbcd..b85a3c63041c 100644
--- a/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/journey-1.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/journey-1.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4bf7f842559127e27b7c012c8f02e43b
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.3 b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.3
index e4ef9fb855a3..511cd1f09e76 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.3
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby19] <d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/jquery-rails-3.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8a2de7df40bc202d631e60eef686ce66
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4 b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
index cac62b118d60..526361afe5e8 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.0:*[ruby_targets_ruby19] <d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/jquery-rails-3.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8a2de7df40bc202d631e60eef686ce66
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.0.4 b/metadata/md5-cache/dev-ruby/jquery-rails-4.0.4
index 35aa707754fb..a2b6d81c9b4b 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.0.4
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=152edc964c836974715d4e77a396a976
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.0.5 b/metadata/md5-cache/dev-ruby/jquery-rails-4.0.5
index a5cce545d55d..079f2eb3dca8 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.0.5
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=152edc964c836974715d4e77a396a976
diff --git a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.0 b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.0
index 2f9f37182ebe..0c2cafade47d 100644
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.1.0
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby20] >=
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-rails-4.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5fa18109c446d6f63fbf99cf0b303742
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
index 9843c111cc86..1094ce678c2e 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.1[ruby_targets_ruby19] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/jquery-ui-rails-3.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c61cf9852e363ee79345506bd4cd10e6
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
index 61aae187c03a..485fe9cf21b0 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4
 SRC_URI=mirror://rubygems/jquery-ui-rails-4.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49d79f4827bdac0995f65f8599df3e65
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.3 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.3
index 88b92602f415..0110c394d568 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.3
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.2.16[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=mirror://rubygems/jquery-ui-rails-5.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b2d4ac88067b05a3c0d17dc47a6a54e
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
index 33a56f2af25c..d4e1c5436995 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=mirror://rubygems/jquery-ui-rails-5.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=029dd8b24908c26e366ebeda1b26efc2
diff --git a/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7 b/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7
index 06fb9dd45e89..7efc0d123fed 100644
--- a/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7
+++ b/metadata/md5-cache/dev-ruby/jruby-openssl-0.7.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-java/jruby-1.5.6 ruby_targets_jruby? ( >=dev-ruby/bouncy-castle-ja
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/jruby-openssl-0.7.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=292d2533631bbadbafd94cc91b718225
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.2.1 b/metadata/md5-cache/dev-ruby/jsobfu-0.2.1
index d924bcbc23b7..c636a3554fbf 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.2.1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=646f53fb072024e21f56001ee0944831
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 ee13b4c424ed..97b25c597375 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( !dev-ruby/jsobfu:0[ruby_targets_ruby19] >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ddf42e140c612f4bd2639d5dc23f765d
diff --git a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0 b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0
index 6b716db80908..eb3092e58859 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rkelly-remix-0.0.6:0[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6967065e8547ac6767ff38dcc3f0cb8a
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 48aa5bf913f8..6c10743eba84 100644
--- a/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/jsobfu-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( !dev-ruby/jsobfu:0[ruby_targets_ruby19] >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4f7e5a5708700b35ac8afb59bedb5bc
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.2-r1 b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
index fc9b15f39310..c0cfa1f4752d 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.2-r1
+++ b/metadata/md5-cache/dev-ruby/json-1.8.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=11ff6a3accbd16773dc243eec40bb3d8
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.3 b/metadata/md5-cache/dev-ruby/json-1.8.3
index 60f4a7bebbc9..5131f3c6852f 100644
--- a/metadata/md5-cache/dev-ruby/json-1.8.3
+++ b/metadata/md5-cache/dev-ruby/json-1.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.8.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c71c9420ede91a1a406bd8f76027dd7
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.5.1 b/metadata/md5-cache/dev-ruby/jwt-1.5.1
index 43150b515b45..2e3693050187 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.5.1
+++ b/metadata/md5-cache/dev-ruby/jwt-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/jwt-1.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c640c34b0f5f0763f15c6d59bc3c59fa
diff --git a/metadata/md5-cache/dev-ruby/jwt-1.5.2 b/metadata/md5-cache/dev-ruby/jwt-1.5.2
index 26f6d5a843c3..0b092c7be775 100644
--- a/metadata/md5-cache/dev-ruby/jwt-1.5.2
+++ b/metadata/md5-cache/dev-ruby/jwt-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/jwt-1.5.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=009c84abec696b891ae397927711d82d
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1
index a58004bbb083..2ce94b16a0d3 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/KirbyBase-2.6.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b9d95deb80945d4d4ba45d164b67c7f6
diff --git a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2 b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
index 2cc970d9f7e7..dc7bdf9ede0f 100644
--- a/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/KirbyBase-2.6.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ee043a11c82e6aa8153e91e93c75c9b
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.1-r1 b/metadata/md5-cache/dev-ruby/kissfft-0.0.1-r1
index c62ae868071c..1c04e3d19c08 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/kissfft-0.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70c3e4f420157aebea7ca7893b5b1f3f
diff --git a/metadata/md5-cache/dev-ruby/kissfft-0.0.2 b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
index 5b7e601a1709..669cedf87b08 100644
--- a/metadata/md5-cache/dev-ruby/kissfft-0.0.2
+++ b/metadata/md5-cache/dev-ruby/kissfft-0.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/kissfft-0.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07508bc3717e10a2a29b8c62711aa0b5
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.4.2 b/metadata/md5-cache/dev-ruby/kramdown-1.4.2
index 057316c42144..ff23fd32c893 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.4.2
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5064759b7d674d3646f4f95bd9de5d8
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.8.0 b/metadata/md5-cache/dev-ruby/kramdown-1.8.0
index 1bdd812cb3b8..28cee199f4ad 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.8.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1da58d8b30517846cfb7474e0f83cdd5
diff --git a/metadata/md5-cache/dev-ruby/kramdown-1.9.0 b/metadata/md5-cache/dev-ruby/kramdown-1.9.0
index d9b8e020ccec..ef7f3b28bcde 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-1.9.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/kramdown-1.9.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=acb2cefae54956baa6cc75fae7e732bf
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3 b/metadata/md5-cache/dev-ruby/launchy-2.4.3
index 1b73d30f7575..a7a1fd5fc6ba 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] !
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/launchy-2.4.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0626a2578201eca1c08d8c2c690d192f
diff --git a/metadata/md5-cache/dev-ruby/lemon-0.9.1 b/metadata/md5-cache/dev-ruby/lemon-0.9.1
index 60e6fd91e12f..a9f004d5b475 100644
--- a/metadata/md5-cache/dev-ruby/lemon-0.9.1
+++ b/metadata/md5-cache/dev-ruby/lemon-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ae[ruby_targets_ruby19] >=dev-ruby/ansi-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/lemon-0.9.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed0c888bdd2a611e093fb2ef8cc2ff18
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.4.0 b/metadata/md5-cache/dev-ruby/letter_opener-1.4.0
index 31921909cebd..36aeaab2ea65 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.4.0
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/launchy[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.4.0.tar.gz -> letter_opener-1.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f73955bb4992c2bf963dcbc30eb1717
diff --git a/metadata/md5-cache/dev-ruby/letter_opener-1.4.1 b/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
index 54ceccd43a54..fde42b364ac8 100644
--- a/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
+++ b/metadata/md5-cache/dev-ruby/letter_opener-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/launchy[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ryanb/letter_opener/archive/v1.4.1.tar.gz -> letter_opener-1.4.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f73955bb4992c2bf963dcbc30eb1717
diff --git a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2 b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
index f032b58bf972..26541cb9b900 100644
--- a/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
+++ b/metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/levenshtein-0.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fbac5863225462b5ee4851290d5b8cab
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.8.0 b/metadata/md5-cache/dev-ruby/libxml-2.8.0
index 9100c393878f..570404486c85 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.8.0
+++ b/metadata/md5-cache/dev-ruby/libxml-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7edd53a03f08304e3b7bfe51aa2574a9
diff --git a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1 b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
index eb15e93c8d04..8d2992f73e2e 100644
--- a/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
+++ b/metadata/md5-cache/dev-ruby/libxml-2.8.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/libxml-ruby-2.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f16dba84812e6e2b1459ee95cef1cdb
diff --git a/metadata/md5-cache/dev-ruby/liquid-2.6.2 b/metadata/md5-cache/dev-ruby/liquid-2.6.2
index a91c3b44d78d..642ca3adaba0 100644
--- a/metadata/md5-cache/dev-ruby/liquid-2.6.2
+++ b/metadata/md5-cache/dev-ruby/liquid-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c1834e1e28dff1380158ff3a06ed96b
diff --git a/metadata/md5-cache/dev-ruby/liquid-3.0.4 b/metadata/md5-cache/dev-ruby/liquid-3.0.4
index e78f032b8afc..a8b9e65ae719 100644
--- a/metadata/md5-cache/dev-ruby/liquid-3.0.4
+++ b/metadata/md5-cache/dev-ruby/liquid-3.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f171bc13612db25e5a166ebde763c230
diff --git a/metadata/md5-cache/dev-ruby/liquid-3.0.6 b/metadata/md5-cache/dev-ruby/liquid-3.0.6
index f159e85d5175..b57ed3b24331 100644
--- a/metadata/md5-cache/dev-ruby/liquid-3.0.6
+++ b/metadata/md5-cache/dev-ruby/liquid-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f171bc13612db25e5a166ebde763c230
diff --git a/metadata/md5-cache/dev-ruby/liquid-c-3.0.0 b/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
index cf440011c4e4..d6d6046f9467 100644
--- a/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
+++ b/metadata/md5-cache/dev-ruby/liquid-c-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/liquid-3.0.0[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/liquid-c-3.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e1bbc795bd1adfede2c4e963329ac88
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 aa3e080acd00..1a81c93b6f2c 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1c8dd642ae1636bca027e9e373dffac
diff --git a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2 b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
index f49db8aece55..a061242649e3 100644
--- a/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
+++ b/metadata/md5-cache/dev-ruby/listen-0.7.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=034f516c56d6fcf699b8c78a4d5cd939
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 2e750b3f78aa..ac6b73fda0ec 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5a85581e5e5f253466385de74c1889e
diff --git a/metadata/md5-cache/dev-ruby/listen-1.3.1-r3 b/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
index 7e6da6cc5271..198ea58ba3d4 100644
--- a/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
+++ b/metadata/md5-cache/dev-ruby/listen-1.3.1-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rb-inotify-0.9.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db7df4d38cdbb18a9b53cd3094e977c0
diff --git a/metadata/md5-cache/dev-ruby/listen-2.8.6-r1 b/metadata/md5-cache/dev-ruby/listen-2.8.6-r1
index a20401c7ec5b..5ac2256b3b2d 100644
--- a/metadata/md5-cache/dev-ruby/listen-2.8.6-r1
+++ b/metadata/md5-cache/dev-ruby/listen-2.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/listen !!media-radio/ax25 ruby_targets_ruby19? ( >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/guard/listen/archive/v2.8.6.tar.gz -> listen-2.8.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc376f4ac221b3a157b70c5235f73f76
diff --git a/metadata/md5-cache/dev-ruby/listen-3.0.5 b/metadata/md5-cache/dev-ruby/listen-3.0.5
index 28dd9426ef12..af0f9ef32ad5 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.0.5
+++ b/metadata/md5-cache/dev-ruby/listen-3.0.5
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.0.5.tar.gz -> listen-3.0.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b118911d42eaef1b74d782e7db189d83
diff --git a/metadata/md5-cache/dev-ruby/listen-3.0.6 b/metadata/md5-cache/dev-ruby/listen-3.0.6
index b1d97c6178a0..6ce6b7645931 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.0.6
+++ b/metadata/md5-cache/dev-ruby/listen-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.0.6.tar.gz -> listen-3.0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85eef057e2cd285135b47f8a97bc2237
diff --git a/metadata/md5-cache/dev-ruby/litc-1.0.3-r1 b/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
index 5258f9932668..cc630498b0af 100644
--- a/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/litc-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/litc-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=44c25556b86fbb5062967289219ae5d2
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r2 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r2
index b99de8aa18ca..98f67ba7d702 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r2
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/little-plugger-1.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b40eda047edaf96f606b88603887259
diff --git a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4 b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
index 01f2bd3e6030..1f6b570bca81 100644
--- a/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
+++ b/metadata/md5-cache/dev-ruby/little-plugger-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/little-plugger-1.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8747e0d1429f47eb7bf5a2b5384538f
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r1 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
index adeac35bc1c3..7f0b1f153b8e 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c59d19a6f58c92bcaec53513f8f2177
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2 b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
index 790e5c28ee9b..893f3edda4a8 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.0.tar.gz -> locale-2.1.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eac7e48316515cd10ceac18d9700a254
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.1 b/metadata/md5-cache/dev-ruby/locale-2.1.1
index cf1f331af4cf..19df27d8e4dc 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.1
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.1.tar.gz -> locale-2.1.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eac7e48316515cd10ceac18d9700a254
diff --git a/metadata/md5-cache/dev-ruby/locale-2.1.2 b/metadata/md5-cache/dev-ruby/locale-2.1.2
index 7558760350e6..082fe6b960b6 100644
--- a/metadata/md5-cache/dev-ruby/locale-2.1.2
+++ b/metadata/md5-cache/dev-ruby/locale-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-gettext/locale/archive/2.1.2.tar.gz -> locale-2.1.2-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eac7e48316515cd10ceac18d9700a254
diff --git a/metadata/md5-cache/dev-ruby/lockfile-2.1.3 b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
index e8dfb791d281..decb6e4d1294 100644
--- a/metadata/md5-cache/dev-ruby/lockfile-2.1.3
+++ b/metadata/md5-cache/dev-ruby/lockfile-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/lockfile-2.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=172dce17c0577edf67b91bcfb6746561
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
index 4be8ef3ed68b..cdb512cdb1f8 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b50312ea069069f8111f29cff7e484da
diff --git a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2 b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
index 921151e7874b..474d19f0da7f 100644
--- a/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/log4r-1.1.10-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/log4r-1.1.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edbd3fff5a80ac10dd9ee38544c6952d
diff --git a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0 b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
index a1d22b8ee967..b2696f91268e 100644
--- a/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
+++ b/metadata/md5-cache/dev-ruby/log_buddy-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/log_buddy-0.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=140701c666fd1fa14931051d7d8bd3c6
diff --git a/metadata/md5-cache/dev-ruby/logging-1.8.2 b/metadata/md5-cache/dev-ruby/logging-1.8.2
index 18e8fff8aac6..5fd5d09c2356 100644
--- a/metadata/md5-cache/dev-ruby/logging-1.8.2
+++ b/metadata/md5-cache/dev-ruby/logging-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/logging-1.8.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6da089c5bbcdd49394fb6aeea75ddbdd
diff --git a/metadata/md5-cache/dev-ruby/logging-2.0.0 b/metadata/md5-cache/dev-ruby/logging-2.0.0
index 85850a517cbc..276182987fc2 100644
--- a/metadata/md5-cache/dev-ruby/logging-2.0.0
+++ b/metadata/md5-cache/dev-ruby/logging-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/little-plugger-1.1.3[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/logging-2.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b59670f31b19e9e6a9bf6c3df01c9fc
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.2-r1 b/metadata/md5-cache/dev-ruby/logue-1.0.2-r1
index 5beadb655993..1574e86a9ef6 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby19] ) r
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	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 234ac103a489..3661ff291571 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-2.0.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6bf0e2df17e90716a596a0543a43c9d
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.0.3 b/metadata/md5-cache/dev-ruby/loofah-2.0.3
index 31f11dccdcde..ed84eeb45e7f 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.0.3
+++ b/metadata/md5-cache/dev-ruby/loofah-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/loofah-2.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=259db64f47d44d921a205a4e73ca1613
diff --git a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2 b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
index 6d779797a49d..dfeece3e6986 100644
--- a/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
+++ b/metadata/md5-cache/dev-ruby/loquacious-1.9.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/loquacious-1.9.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=555dc8a4ac8ef9fb31355c35a94a1d3b
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.10 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
index f4ee1552583f..6117e4e4952d 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/lumberjack-1.0.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7614a7fed82a24d8e10c0c305a720d7
diff --git a/metadata/md5-cache/dev-ruby/lumberjack-1.0.9 b/metadata/md5-cache/dev-ruby/lumberjack-1.0.9
index 4ce79704b811..cfd1718c6f54 100644
--- a/metadata/md5-cache/dev-ruby/lumberjack-1.0.9
+++ b/metadata/md5-cache/dev-ruby/lumberjack-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/lumberjack-1.0.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3385ed47a7ca177689ef4dea8fa5b99b
diff --git a/metadata/md5-cache/dev-ruby/mab-0.0.3 b/metadata/md5-cache/dev-ruby/mab-0.0.3
index c9a302f7576c..15469870b829 100644
--- a/metadata/md5-cache/dev-ruby/mab-0.0.3
+++ b/metadata/md5-cache/dev-ruby/mab-0.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mab-0.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65f55a6dd22453cbdc59d8ca6516633c
diff --git a/metadata/md5-cache/dev-ruby/magic-0.2.9 b/metadata/md5-cache/dev-ruby/magic-0.2.9
index edd852f30519..f07910604544 100644
--- a/metadata/md5-cache/dev-ruby/magic-0.2.9
+++ b/metadata/md5-cache/dev-ruby/magic-0.2.9
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/qoobaa/magic/archive/v0.2.9.tar.gz -> magic-0.2.9.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1404dec084998d821256fa352924926a
diff --git a/metadata/md5-cache/dev-ruby/mail-2.5.4 b/metadata/md5-cache/dev-ruby/mail-2.5.4
index cb650ebccfcf..560648f03d91 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.5.4
+++ b/metadata/md5-cache/dev-ruby/mail-2.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.5
 SRC_URI=https://github.com/mikel/mail/archive/2.5.4.tar.gz -> mail-2.5.4-git.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5a82f682b186216cf42f6cf66d8746d9
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.2 b/metadata/md5-cache/dev-ruby/mail-2.6.2
index 69859b247645..fcdbcb2cb837 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.2
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] <
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.2.tar.gz -> mail-2.6.2-git.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fe42d6fbf0284e9181edde1ca25624f
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.3 b/metadata/md5-cache/dev-ruby/mail-2.6.3
index bfc348e6b933..6dd17b7f155e 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.6.3
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] <
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2.6
 SRC_URI=https://github.com/mikel/mail/archive/2.6.3.tar.gz -> mail-2.6.3-git.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e54590cf9eb6e5488d3a6ec43468d490
diff --git a/metadata/md5-cache/dev-ruby/map-6.5.5 b/metadata/md5-cache/dev-ruby/map-6.5.5
index c8b3eab7bebd..972243547c49 100644
--- a/metadata/md5-cache/dev-ruby/map-6.5.5
+++ b/metadata/md5-cache/dev-ruby/map-6.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/map-6.5.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=742e8f4705c85246e2aae6e7a69ee6e1
diff --git a/metadata/md5-cache/dev-ruby/map-6.6.0 b/metadata/md5-cache/dev-ruby/map-6.6.0
index 2c9ffa7987a3..2abf6c654d30 100644
--- a/metadata/md5-cache/dev-ruby/map-6.6.0
+++ b/metadata/md5-cache/dev-ruby/map-6.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/map-6.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=742e8f4705c85246e2aae6e7a69ee6e1
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.2 b/metadata/md5-cache/dev-ruby/maruku-0.7.2
index 8002beef7126..3aee35dc076f 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.2
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e09fe880cea2909933b5e727d4f24b7a
diff --git a/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1 b/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
index 0aa86776e675..94b2748f96cf 100644
--- a/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
+++ b/metadata/md5-cache/dev-ruby/maruku-0.7.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( highlight? ( dev-ruby/syntax[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/maruku-0.7.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=778024eeb9bec32cfceb57a431717739
diff --git a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2 b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
index 4b9c1cf3bf9a..8dcd5a2ed886 100644
--- a/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/mash-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mash-0.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=acc8b601ea8ed5aa5deb04e7d62a41ab
diff --git a/metadata/md5-cache/dev-ruby/matchy-0.5.2-r1 b/metadata/md5-cache/dev-ruby/matchy-0.5.2-r1
index 78dee6c4f7ab..c0ee6e5d576d 100644
--- a/metadata/md5-cache/dev-ruby/matchy-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/matchy-0.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/mcmire-matchy-0.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2e9dcbcbf2a9da63d4d247ecd3f8af96
diff --git a/metadata/md5-cache/dev-ruby/maxitest-1.5.4 b/metadata/md5-cache/dev-ruby/maxitest-1.5.4
index ca48ceeb47ba..6542ef21d17e 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-1.5.4
+++ b/metadata/md5-cache/dev-ruby/maxitest-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v1.5.4.tar.gz -> maxitest-1.5.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9582853fb16c8629a2ed0d42a94728c4
diff --git a/metadata/md5-cache/dev-ruby/maxitest-1.5.5 b/metadata/md5-cache/dev-ruby/maxitest-1.5.5
index c8743ea9f03f..446e4e61c2c2 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-1.5.5
+++ b/metadata/md5-cache/dev-ruby/maxitest-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v1.5.5.tar.gz -> maxitest-1.5.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=381d7e725e74dc0963c07be9db9a381f
diff --git a/metadata/md5-cache/dev-ruby/maxitest-1.5.6 b/metadata/md5-cache/dev-ruby/maxitest-1.5.6
index 53f61c7f6bb1..5aef377533e1 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-1.5.6
+++ b/metadata/md5-cache/dev-ruby/maxitest-1.5.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v1.5.6.tar.gz -> maxitest-1.5.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=381d7e725e74dc0963c07be9db9a381f
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996
index ef3a9eee84fa..9f68e6a4deec 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996
@@ -10,5 +10,5 @@ RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://mecab.googlecode.com/files/mecab-ruby-0.996.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4378dd3527b4fa994892f09c44af5603
diff --git a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1 b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
index 5d443856ce69..b90055c4ea6f 100644
--- a/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
+++ b/metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
@@ -10,5 +10,5 @@ RDEPEND=~app-text/mecab-0.996 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://mecab.googlecode.com/files/mecab-ruby-0.996.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a3337f1aae6312c9348199120496a08
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.3 b/metadata/md5-cache/dev-ruby/mechanize-2.7.3
index 45214d0b65bb..0d1edb441a21 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.3
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef145088c11fbebf12e64402b5e6fdba
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1 b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
index 827c9258e031..077e2d9e0e80 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4-r1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4cdc7bde11abbc4ef041f2d9e5d4e3e6
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.4 b/metadata/md5-cache/dev-ruby/mechanize-2.7.4
index c79ef5bfc307..13adf0a0799c 100644
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.4
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby20] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mechanize-2.7.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b72720eb4a39d88b84f15755a61fbcfa
diff --git a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1 b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1
index 04ee6d1aeed0..92a08fbcf2ba 100644
--- a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1
+++ b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/memcache-client-1.8.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=040eda7723d64220af6e11231ea73908
diff --git a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2 b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
index e481204e8cac..c5709da06feb 100644
--- a/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
+++ b/metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/memcache-client-1.8.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad1da55bb32d55b40871ff9c22bb36c6
diff --git a/metadata/md5-cache/dev-ruby/memoist-0.14.0 b/metadata/md5-cache/dev-ruby/memoist-0.14.0
index 0989f49a530f..8ac36d628b33 100644
--- a/metadata/md5-cache/dev-ruby/memoist-0.14.0
+++ b/metadata/md5-cache/dev-ruby/memoist-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoist-0.14.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5dd0ecca880808ea38d2964db48c09a
diff --git a/metadata/md5-cache/dev-ruby/memoizable-0.4.2 b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
index fc7962f6a55c..df2866722bd8 100644
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoizable-0.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97bc47ed579799d9706c739705ac2edf
diff --git a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1 b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
index 2cc6acb59969..52b362936de0 100644
--- a/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/memoize-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/memoize-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3d5ef4009899ced54b6d05df4fa45b9
diff --git a/metadata/md5-cache/dev-ruby/mercenary-0.3.5 b/metadata/md5-cache/dev-ruby/mercenary-0.3.5
index 91046ba8cc6c..a14cd34fdea9 100644
--- a/metadata/md5-cache/dev-ruby/mercenary-0.3.5
+++ b/metadata/md5-cache/dev-ruby/mercenary-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mercenary-0.3.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d632f499f1f63ed1a43143fc2659aa6d
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1 b/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
index e7d21c4fcde8..f73bf3cd02f8 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/metaclass-0.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af76470fa01844e70cd4c991a2042a49
diff --git a/metadata/md5-cache/dev-ruby/metaclass-0.0.4 b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
index 4d899b9feb1e..ac18d849c09e 100644
--- a/metadata/md5-cache/dev-ruby/metaclass-0.0.4
+++ b/metadata/md5-cache/dev-ruby/metaclass-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/floehopper/metaclass/archive/v0.0.4.tar.gz -> metaclass-0.0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f9e0dce4a0e2abacb6156be9d9405a65
diff --git a/metadata/md5-cache/dev-ruby/metaid-1.0-r3 b/metadata/md5-cache/dev-ruby/metaid-1.0-r3
index 67f449271100..eea3a7c67b5d 100644
--- a/metadata/md5-cache/dev-ruby/metaid-1.0-r3
+++ b/metadata/md5-cache/dev-ruby/metaid-1.0-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/metaid-1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea582224984e692edf6de4ab982d4a79
diff --git a/metadata/md5-cache/dev-ruby/metasm-1.0.2-r3 b/metadata/md5-cache/dev-ruby/metasm-1.0.2-r3
index 8e19fd20f16f..efde06316fc5 100644
--- a/metadata/md5-cache/dev-ruby/metasm-1.0.2-r3
+++ b/metadata/md5-cache/dev-ruby/metasm-1.0.2-r3
@@ -10,5 +10,5 @@ RDEPEND=!dev-ruby/metasploit-model:0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0.2
 SRC_URI=mirror://rubygems/metasm-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2456ee1a033819f7af46acd9105e351f
diff --git a/metadata/md5-cache/dev-ruby/metasploit-concern-1.0.0 b/metadata/md5-cache/dev-ruby/metasploit-concern-1.0.0
index 44e583913040..c033e9ef364b 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-concern-1.0.0
+++ b/metadata/md5-cache/dev-ruby/metasploit-concern-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://rubygems/metasploit-concern-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=625793137840bd4f044bb22e8e6a83da
diff --git a/metadata/md5-cache/dev-ruby/metasploit-credential-1.0.0 b/metadata/md5-cache/dev-ruby/metasploit-credential-1.0.0
index eed7128e1886..c0c4c2440695 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-credential-1.0.0
+++ b/metadata/md5-cache/dev-ruby/metasploit-credential-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/metasploit-credential-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bbbe551fc485d696000a190ca2acff77
diff --git a/metadata/md5-cache/dev-ruby/metasploit-credential-1.0.1 b/metadata/md5-cache/dev-ruby/metasploit-credential-1.0.1
index 203ac6b79453..ab2614c946a7 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-credential-1.0.1
+++ b/metadata/md5-cache/dev-ruby/metasploit-credential-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.0.1
 SRC_URI=mirror://rubygems/metasploit-credential-1.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=34c3993ce009bcc2ae97673d7c97a0bb
diff --git a/metadata/md5-cache/dev-ruby/metasploit-model-1.0.0 b/metadata/md5-cache/dev-ruby/metasploit-model-1.0.0
index b2ef1ae239a8..9cfcf466a55a 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-model-1.0.0
+++ b/metadata/md5-cache/dev-ruby/metasploit-model-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1.0
 SRC_URI=mirror://rubygems/metasploit-model-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40852647dcd9c23d8135bd7a9019e2a2
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.15 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.15
index 9b38cdc0aa6c..538b685aefab 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.15
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=1.0.15
 SRC_URI=mirror://rubygems/metasploit-payloads-1.0.15.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a92ef9691a097bb895ec43bb67bf849b
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.19 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.19
index 3750079b3ddb..728cd286c140 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.19
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=1.0.19
 SRC_URI=mirror://rubygems/metasploit-payloads-1.0.19.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a92ef9691a097bb895ec43bb67bf849b
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.21 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.21
index 9fb290595da0..eef1d700cf62 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.21
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=1.0.21
 SRC_URI=mirror://rubygems/metasploit-payloads-1.0.21.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a92ef9691a097bb895ec43bb67bf849b
diff --git a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.22 b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.22
index 249fe72faeb9..63d94081c2d6 100644
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.22
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test strip
 SLOT=1.0.22
 SRC_URI=mirror://rubygems/metasploit-payloads-1.0.22.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a92ef9691a097bb895ec43bb67bf849b
diff --git a/metadata/md5-cache/dev-ruby/metasploit_data_models-1.2.10 b/metadata/md5-cache/dev-ruby/metasploit_data_models-1.2.10
index 0a6312e92982..f0c1e60c48c9 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_data_models-1.2.10
+++ b/metadata/md5-cache/dev-ruby/metasploit_data_models-1.2.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1.2.10
 SRC_URI=mirror://rubygems/metasploit_data_models-1.2.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0bcbf2d70b0b2f5f84696875210fdc3
diff --git a/metadata/md5-cache/dev-ruby/metasploit_data_models-1.2.9 b/metadata/md5-cache/dev-ruby/metasploit_data_models-1.2.9
index 5db4a26c0b66..ddfdb043c4f9 100644
--- a/metadata/md5-cache/dev-ruby/metasploit_data_models-1.2.9
+++ b/metadata/md5-cache/dev-ruby/metasploit_data_models-1.2.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1.2.9
 SRC_URI=mirror://rubygems/metasploit_data_models-1.2.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0bcbf2d70b0b2f5f84696875210fdc3
diff --git a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22 b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
index 475a0fd7a2e0..7289248e323c 100644
--- a/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
+++ b/metadata/md5-cache/dev-ruby/meterpreter_bins-0.0.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0.0.22
 SRC_URI=mirror://rubygems/meterpreter_bins-0.0.22.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1d8751358e1bb1c502749fe87c7187a
diff --git a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3 b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
index 57e523bb2bdb..0a5cd9c51fac 100644
--- a/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
+++ b/metadata/md5-cache/dev-ruby/method_source-0.8.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/method_source-0.8.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae740fae3c747dac7aef36e05d6e6d7e
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 362b4cfd68a1..b30ecaf9aa66 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-1.25.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-1.25.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d74d083aa5c08b04865cec261021721b
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 f674964c6994..d66930487801 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-2.6.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96e4c8a0363405671c3e7a37c730cb41
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.0 b/metadata/md5-cache/dev-ruby/mime-types-3.0
index b43f6b651dbb..7a330a7ad5ef 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.0
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31605dfdcc47224df44f3d58fe5bbbc0
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120
index 826803e11af9..f55e661175d8 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2015.1120
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/mime-types-data-3.2015.1120.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7ca12d8c647fa16542bfed734df13e1
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.0 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.0
index 3336fab8367a..d58d8cde347e 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.0
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d274278ab6501b4d957b5a6b131a40c
diff --git a/metadata/md5-cache/dev-ruby/mimemagic-0.3.1 b/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
index b89ce76f24b8..a1d2cea19245 100644
--- a/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
+++ b/metadata/md5-cache/dev-ruby/mimemagic-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/mimemagic-0.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=068713362c66736d9ab8d33303d0cbb2
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.3.6 b/metadata/md5-cache/dev-ruby/mini_magick-4.3.6
index ecb0aa2dfe53..886d335c715e 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.3.6
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.3.6
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.3.6.tar.gz -> mini_magick-4.3.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d133e0942ce12315529e3708724952b
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.4.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.4.0
index 6de38e2fd27a..3374c91e2365 100644
--- a/metadata/md5-cache/dev-ruby/mini_magick-4.4.0
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/imagemagick ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/minimagick/minimagick/archive/v4.4.0.tar.gz -> mini_magick-4.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8796a380ed5efb22e73dc7df01768b17
diff --git a/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1 b/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
index 0533ee470c60..b6291144f4b0 100644
--- a/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/mini_shoulda-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >dev-ruby/minitest-2.1.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/mini_shoulda-0.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f707310ebdf369e3cf7339503638040e
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
index 9b17b46e7854..76acd2e0bca1 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=12525d26ae2f1b4ddf206f3453ae3f1b
diff --git a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2 b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
index 0b7d4e66fcab..692b88e23c00 100644
--- a/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
+++ b/metadata/md5-cache/dev-ruby/minitest-4.7.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-4.7.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc671d70924de7781f1a67c88e096bc8
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1 b/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
index c50011569e94..70f176765e05 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=626ffe80f3336f88c313f0aca9600d6a
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.5.1 b/metadata/md5-cache/dev-ruby/minitest-5.5.1
index 02771e1e2201..6655a6759b5d 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.5.1
+++ b/metadata/md5-cache/dev-ruby/minitest-5.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68c5afce51532714f00c81626b87bb26
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.8.3 b/metadata/md5-cache/dev-ruby/minitest-5.8.3
index 10caaf12ee2e..018cc1d3e224 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.8.3
+++ b/metadata/md5-cache/dev-ruby/minitest-5.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.8.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f2fc2bf30d9e6f0d6670562481ff531
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.8.4 b/metadata/md5-cache/dev-ruby/minitest-5.8.4
index bd12575fe0dd..4c1c827405f8 100644
--- a/metadata/md5-cache/dev-ruby/minitest-5.8.4
+++ b/metadata/md5-cache/dev-ruby/minitest-5.8.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=5
 SRC_URI=mirror://rubygems/minitest-5.8.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cbc12327905ebf559ab355f7370b485
diff --git a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0 b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
index 01a99e2a085b..f41d97046dca 100644
--- a/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
+++ b/metadata/md5-cache/dev-ruby/minitest-bonus-assertions-2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/minitest-bonus-assertions-2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bf0724e9d7a8bf0d6791b951bc33fe49
diff --git a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1 b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
index cad89fbbce5d..95259b8c86d4 100644
--- a/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
+++ b/metadata/md5-cache/dev-ruby/minitest-pretty_diff-0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-pretty_diff-0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0baef42536ec74d2893df5d1cd4a1bf3
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.5 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.5
index ad161ab9b415..79d97306afcf 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.5
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/2.2.5.tar.gz -> mixlib-shellout-2.2.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c4fd72de82c7059f18b070fabf0ab99
diff --git a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.6 b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.6
index 16e7985d15d1..afacd75c6810 100644
--- a/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.6
+++ b/metadata/md5-cache/dev-ruby/mixlib-shellout-2.2.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/opscode/mixlib-shellout/archive/2.2.6.tar.gz -> mixlib-shellout-2.2.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=739886cc5a66979bbdacfda51a778062
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
index 5fc64d12cf40..81f82fbdc59f 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3bb3cfa57c469da8a36b85dc71219ab2
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2 b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
index ee6a8e90b4b6..9efa26d34096 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a197345c3e6e15496e8f86d721eba16c
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4 b/metadata/md5-cache/dev-ruby/mocha-0.11.4
index 925dfe6253b0..862b294b8d98 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=628595c61089caab58cf61b55dd01136
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1 b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
index a838730aa984..0593b8b4a0b4 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c75f49a8c64bc9666e413552255d6a5
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10 b/metadata/md5-cache/dev-ruby/mocha-0.12.10
index 27b31a679813..b20c9e3f3aed 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4230a7c223feb53bde285afc30e3a2b2
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1 b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
index 144704a1df15..298817fca16b 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.10-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d00c524a35b268f35b218b586816cedc
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.7 b/metadata/md5-cache/dev-ruby/mocha-0.12.7
index 5b1e07a54635..12daa1793280 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.7
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=343f9c5211920c9c1422b74d63dfd064
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3 b/metadata/md5-cache/dev-ruby/mocha-0.13.3
index 6ed7911551e6..d3c11d68464b 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a193e0ba090516598f306ec8c7dd5233
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
index 69ec2b314729..c9f895363a26 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f27474e1cf467657c98fbd65bd298e3
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2 b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
index e608e27121e4..9c6a86c8ebba 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc2d02ca80a5b4db4525e62894e4e721
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.14.0 b/metadata/md5-cache/dev-ruby/mocha-0.14.0
index 9232acf69e8e..907c66b8cd3b 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.14.0
+++ b/metadata/md5-cache/dev-ruby/mocha-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.14
 SRC_URI=mirror://rubygems/mocha-0.14.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60dc833f07062615d6e8189ceee593c3
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.1.0 b/metadata/md5-cache/dev-ruby/mocha-1.1.0
index 85d6da209bd9..cf501ea703ad 100644
--- a/metadata/md5-cache/dev-ruby/mocha-1.1.0
+++ b/metadata/md5-cache/dev-ruby/mocha-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/introspection[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.0
 SRC_URI=mirror://rubygems/mocha-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1b90d8bba265a35c63c1162a909413e
diff --git a/metadata/md5-cache/dev-ruby/modernizr-2.6.2 b/metadata/md5-cache/dev-ruby/modernizr-2.6.2
index 0a0f6fee5377..88fbb3d1411e 100644
--- a/metadata/md5-cache/dev-ruby/modernizr-2.6.2
+++ b/metadata/md5-cache/dev-ruby/modernizr-2.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/modernizr-2.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=798d019bb2c8f46c7fc73a40415c59bb
diff --git a/metadata/md5-cache/dev-ruby/moneta-0.8.0 b/metadata/md5-cache/dev-ruby/moneta-0.8.0
index 5206a32c127a..25808c81c8d6 100644
--- a/metadata/md5-cache/dev-ruby/moneta-0.8.0
+++ b/metadata/md5-cache/dev-ruby/moneta-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/minad/moneta/archive/v0.8.0.tar.gz -> moneta-0.8.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3fb2ccdc8a251f0997698383809a1c7e
diff --git a/metadata/md5-cache/dev-ruby/mongo-1.12.0 b/metadata/md5-cache/dev-ruby/mongo-1.12.0
index 194a027a0855..a5f003e18bcc 100644
--- a/metadata/md5-cache/dev-ruby/mongo-1.12.0
+++ b/metadata/md5-cache/dev-ruby/mongo-1.12.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/bson-1.12.0[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/1.12.0.tar.gz -> mongo-ruby-driver-1.12.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5fa1cc876443b415ac1006090a083faf
diff --git a/metadata/md5-cache/dev-ruby/mongo-2.0.6 b/metadata/md5-cache/dev-ruby/mongo-2.0.6
index 14c5d9488817..bada4fd0a6e5 100644
--- a/metadata/md5-cache/dev-ruby/mongo-2.0.6
+++ b/metadata/md5-cache/dev-ruby/mongo-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-ruby-driver/archive/2.0.6.tar.gz -> mongo-ruby-driver-2.0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa87bb771a349b164167aeae94f65635
diff --git a/metadata/md5-cache/dev-ruby/mongoid-2.8.1 b/metadata/md5-cache/dev-ruby/mongoid-2.8.1
index 7fc0fe183172..cfd07bb8ad99 100644
--- a/metadata/md5-cache/dev-ruby/mongoid-2.8.1
+++ b/metadata/md5-cache/dev-ruby/mongoid-2.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-3.1[ruby_targets_ruby20] =
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/mongoid/archive/v2.8.1.tar.gz -> mongoid-2.8.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b91f594c41482423c61dc497ba22f8c9
diff --git a/metadata/md5-cache/dev-ruby/msgpack-0.7.1 b/metadata/md5-cache/dev-ruby/msgpack-0.7.1
index 6fb4d6161b45..e644d0c34818 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-0.7.1
+++ b/metadata/md5-cache/dev-ruby/msgpack-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-0.7.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6cd542a54f531c76c39f7e0300a70127
diff --git a/metadata/md5-cache/dev-ruby/msgpack-0.7.4 b/metadata/md5-cache/dev-ruby/msgpack-0.7.4
index 2ccc24f4f488..37f62fc8cce0 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-0.7.4
+++ b/metadata/md5-cache/dev-ruby/msgpack-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-0.7.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a721d3a7f37332bbf5a54a73338ccb9
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.10.1 b/metadata/md5-cache/dev-ruby/multi_json-1.10.1
index bd4cc6706af7..99a3384f1cca 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.10.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_json-1.10.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df16d3865a432a8a9e8e8e3d1c0e22a4
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.11.0 b/metadata/md5-cache/dev-ruby/multi_json-1.11.0
index eff849eb339d..21709d0bc0fd 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.11.0
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.11.0.tar.gz -> multi_json-1.11.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54cbf65b60b8cbd0c25df833ed761510
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.11.1 b/metadata/md5-cache/dev-ruby/multi_json-1.11.1
index f7e26fbe5bd7..9509c6e8f493 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.11.1
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.11.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.11.1.tar.gz -> multi_json-1.11.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73133fee7578160e6d7e69638e87228a
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.11.2 b/metadata/md5-cache/dev-ruby/multi_json-1.11.2
index 379a556b02ce..fa12befb1756 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.11.2
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.11.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/intridea/multi_json/archive/v1.11.2.tar.gz -> multi_json-1.11.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73133fee7578160e6d7e69638e87228a
diff --git a/metadata/md5-cache/dev-ruby/multi_json-1.9.3 b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
index d8f921e841a5..b0961d24ab71 100644
--- a/metadata/md5-cache/dev-ruby/multi_json-1.9.3
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_json-1.9.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92b1f4bce6c6de69515b154da4633806
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.1 b/metadata/md5-cache/dev-ruby/multi_test-0.1.1
index 99e63a403162..e13c129d62dd 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.1
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/multi_test-0.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e88a62511184e3aa6571c971f6678270
diff --git a/metadata/md5-cache/dev-ruby/multi_test-0.1.2 b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
index 87977b1403df..3609997058cb 100644
--- a/metadata/md5-cache/dev-ruby/multi_test-0.1.2
+++ b/metadata/md5-cache/dev-ruby/multi_test-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/multi_test-0.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c29fe43996a413fe177dd0cd705aa16f
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r1 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r1
index 6b1201dfe059..c6120083cf5e 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r1
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-0.5.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfe2e17ddc5fe3c179f575ce7ed7d361
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
index fe1046677186..386da2077c5a 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-0.5.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf54d0a07eb961414591ac8e3c9408f7
diff --git a/metadata/md5-cache/dev-ruby/multi_xml-0.5.5 b/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
index e780051ed683..9154cfa52e6e 100644
--- a/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
+++ b/metadata/md5-cache/dev-ruby/multi_xml-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multi_xml-0.5.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef42642f86aaee1bf8676b01eb3499b9
diff --git a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1 b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
index 3b37e7ca486f..d514b9a7ac94 100644
--- a/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/multipart-post-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/multipart-post-2.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4568d1fd06bc21a38e1152d9a636c207
diff --git a/metadata/md5-cache/dev-ruby/mustache-0.99.5 b/metadata/md5-cache/dev-ruby/mustache-0.99.5
index d9793fdcfdd3..05db361059d4 100644
--- a/metadata/md5-cache/dev-ruby/mustache-0.99.5
+++ b/metadata/md5-cache/dev-ruby/mustache-0.99.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-0.99.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02b592c84a1ab554f8e97283aaad768d
diff --git a/metadata/md5-cache/dev-ruby/mustache-0.99.5-r1 b/metadata/md5-cache/dev-ruby/mustache-0.99.5-r1
index 5daa2a062ba6..a7973adb2dca 100644
--- a/metadata/md5-cache/dev-ruby/mustache-0.99.5-r1
+++ b/metadata/md5-cache/dev-ruby/mustache-0.99.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-0.99.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=51ca88a23904ae99fcec68de45f72865
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.1 b/metadata/md5-cache/dev-ruby/mustache-1.0.1
index f5d8d32c3fd7..7bb0a571f829 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.1
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dac857a4f31bf2669ed05a7e8f7e2947
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.2 b/metadata/md5-cache/dev-ruby/mustache-1.0.2
index c49c59c33ffb..0fe65bf97785 100644
--- a/metadata/md5-cache/dev-ruby/mustache-1.0.2
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mustache-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d51d8487100b5487608305c6f85c8e71
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.3.19 b/metadata/md5-cache/dev-ruby/mysql2-0.3.19
index 27208178800e..e00bc97eab1f 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.3.19
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.3.19
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.3
 SRC_URI=mirror://rubygems/mysql2-0.3.19.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93ea8b967cfbe4e80eac8fbd13882642
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.3.20 b/metadata/md5-cache/dev-ruby/mysql2-0.3.20
index f24294706756..1e725fc7449a 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.3.20
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.3.20
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.3
 SRC_URI=mirror://rubygems/mysql2-0.3.20.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93ea8b967cfbe4e80eac8fbd13882642
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.1 b/metadata/md5-cache/dev-ruby/mysql2-0.4.1
index 7b468d529def..912ba4e459ef 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.1
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61c6f3d4a951b9029d5d40384045a077
diff --git a/metadata/md5-cache/dev-ruby/mysql2-0.4.2 b/metadata/md5-cache/dev-ruby/mysql2-0.4.2
index 7f6138e2da4d..a5bedec4f7ec 100644
--- a/metadata/md5-cache/dev-ruby/mysql2-0.4.2
+++ b/metadata/md5-cache/dev-ruby/mysql2-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/libmysqlclient:= ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.4
 SRC_URI=mirror://rubygems/mysql2-0.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61c6f3d4a951b9029d5d40384045a077
diff --git a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1 b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
index add3a04982db..254e3a78d1d8 100644
--- a/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/nagios-0.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nagios-0.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4107e21d26c430076f8da625b2325538
diff --git a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1 b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
index 67e0307ad9f4..3e3be6b8837f 100644
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nagios_analyzer-0.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e778eeae3a2a7bc7c2e93d9fc2041dbe
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
index 8da874d91843..77282d1e3ba9 100644
--- a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanotest-0.9.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87f8ad42615a653d72bfdc222854abc6
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r1 b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r1
index 947929ce2f4e..c97c9bc2cd0d 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r1
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.0.8.tar.gz -> narray-0.6.0.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=347080b5f706c4061091601b2f6d252c
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.1 b/metadata/md5-cache/dev-ruby/narray-0.6.1.1
index df5ddc0b6488..ffae3019579c 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.1
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.1.tar.gz -> narray-0.6.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6254400e6846be8bb3bf2e4a4ca24da4
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
index 74ee1a07b404..dafb824c5c5c 100644
--- a/metadata/md5-cache/dev-ruby/narray-0.6.1.2
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4b94db5adde34f72241da5f2f942ba7
diff --git a/metadata/md5-cache/dev-ruby/naught-1.0.0 b/metadata/md5-cache/dev-ruby/naught-1.0.0
index 32dd4897c623..a1fc098f7791 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.0.0
+++ b/metadata/md5-cache/dev-ruby/naught-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=mirror://rubygems/naught-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=adf88c6b18c8a310e48863c4e4a91cda
diff --git a/metadata/md5-cache/dev-ruby/naught-1.1.0 b/metadata/md5-cache/dev-ruby/naught-1.1.0
index d73eed26ac89..991981634538 100644
--- a/metadata/md5-cache/dev-ruby/naught-1.1.0
+++ b/metadata/md5-cache/dev-ruby/naught-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=5
 SRC_URI=mirror://rubygems/naught-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ac30e7da864b1d72e68c4889b338e0a
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.2.0 b/metadata/md5-cache/dev-ruby/nenv-0.2.0
index 84ea972e5e4f..243c56c7a04c 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.2.0
+++ b/metadata/md5-cache/dev-ruby/nenv-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.2.0.tar.gz -> nenv-0.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0212d5ca9bc90ff611e055f90e91c2f4
diff --git a/metadata/md5-cache/dev-ruby/nenv-0.3.0 b/metadata/md5-cache/dev-ruby/nenv-0.3.0
index d03375ac66d1..172f767fac3d 100644
--- a/metadata/md5-cache/dev-ruby/nenv-0.3.0
+++ b/metadata/md5-cache/dev-ruby/nenv-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/e2/nenv/archive/v0.3.0.tar.gz -> nenv-0.3.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d81194ee3fa47df9cbd572d55302709e
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r1 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r1
index 3eaba5618147..8d69d69e403f 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r1
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0baa293ed3e8c643d2a595f22e0b4c59
diff --git a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2 b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
index 9451bf19c274..ff8374554481 100644
--- a/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
+++ b/metadata/md5-cache/dev-ruby/net-http-digest_auth-1.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-digest_auth-1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a004a4015197aaeabbd5523061f8b5b5
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
index e2614fc7707c..2ebddf352471 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=778c1c7ea9bad35d47548e4ffe04de5b
diff --git a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2 b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
index 4d5ef64a94fe..7670b5806316 100644
--- a/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
+++ b/metadata/md5-cache/dev-ruby/net-http-persistent-2.9.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-http-persistent-2.9.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58768e061564a8e3719780de65ae32f5
diff --git a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1 b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
index 7e7cccef1e47..6ce3461961de 100644
--- a/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
+++ b/metadata/md5-cache/dev-ruby/net-http-pipeline-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/net-http-pipeline-1.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=356ad9663d8e6e674d64911e6b4cfc82
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1 b/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
index 623179c2978e..7243179c55b3 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-scp-1.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fc0606d4f24c7128ca8816fd7739e759
diff --git a/metadata/md5-cache/dev-ruby/net-scp-1.2.1 b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
index 19a3c1c39e1a..629c4adda6f7 100644
--- a/metadata/md5-cache/dev-ruby/net-scp-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-scp-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f4bb49ba85d2f2057ebe80dae40de86
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1 b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1
index 734ad1c0f9e1..311e8178b5cc 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-sftp-2.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd5bd135b54ab6f4d4d380b7fa5baa8c
diff --git a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2 b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
index 1818d004ee44..4f11d2fd8c04 100644
--- a/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-sftp-2.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e56f8331e24e3dffe96c8b44ef20aa3
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0 b/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
index 897c6c7fd135..3959fa26e795 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2.6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.10.0.tar.gz -> net-ssh-git-2.10.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=01cfc8bd5cd7550e3c8f6ff33c9608e4
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.8.0 b/metadata/md5-cache/dev-ruby/net-ssh-2.8.0
index 0b8e3b16ec89..001ca269e52a 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.8.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2.6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.8.0.tar.gz -> net-ssh-git-2.8.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7a455aaea46c81edd656fbda61ca013
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.9.2 b/metadata/md5-cache/dev-ruby/net-ssh-2.9.2
index 7a2e02f30c24..b2c358b61ab2 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.9.2
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2.6
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.9.2.tar.gz -> net-ssh-git-2.9.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c81cde49d7dcb1d9b2bde6c5d4f775f2
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-3.0.1 b/metadata/md5-cache/dev-ruby/net-ssh-3.0.1
index 15e07264a577..904b00cbadce 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-3.0.1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v3.0.1.tar.gz -> net-ssh-git-3.0.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e05bfde50ed102c91126041d01795384
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-3.0.2 b/metadata/md5-cache/dev-ruby/net-ssh-3.0.2
index 0edc01e8fe0b..e53644554772 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-3.0.2
+++ b/metadata/md5-cache/dev-ruby/net-ssh-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/net-ssh/net-ssh/archive/v3.0.2.tar.gz -> net-ssh-git-3.0.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e05bfde50ed102c91126041d01795384
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0
index d801002fafcf..660d1cf46f6b 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-ssh-gateway-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9febac1c7d67883a79c51ac822a11fa
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
index 6907ec5ab5b4..1ba22a36a1bf 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-gateway-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/net-ssh-gateway-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=000f986f5a5fd0f9a3124ac4a756d161
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.0-r1 b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.0-r1
index 870ab459fe65..5e3d1283b96e 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-ssh-multi/archive/v1.2.0.tar.gz -> net-ssh-multi-1.2.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ae6984163bb685a055a36161cec84d6
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1 b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
index ea3fefbe630a..9a4960fa2fb0 100644
--- a/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
+++ b/metadata/md5-cache/dev-ruby/net-ssh-multi-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/net-ssh/net-ssh-multi/archive/v1.2.1.tar.gz -> net-ssh-multi-1.2.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6bb0a26917667d704e95659370b95d93
diff --git a/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1 b/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
index 5362e0bd5d63..d4a854e96936 100644
--- a/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/net-telnet-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/ruby/net-telnet/archive/v0.1.1.tar.gz -> net-telnet-0.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17e80144b2a62c87df89d93fd2436097
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.10.3 b/metadata/md5-cache/dev-ruby/netrc-0.10.3
index f40d8ce66de1..8e77add3ac50 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.10.3
+++ b/metadata/md5-cache/dev-ruby/netrc-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/netrc-0.10.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=22245feec954df6d538b17a467a29baa
diff --git a/metadata/md5-cache/dev-ruby/netrc-0.11.0 b/metadata/md5-cache/dev-ruby/netrc-0.11.0
index ba6963a3a769..9cfd8c3e285e 100644
--- a/metadata/md5-cache/dev-ruby/netrc-0.11.0
+++ b/metadata/md5-cache/dev-ruby/netrc-0.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/netrc-0.11.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5958194ddea0d5238bb9d4770aef6c33
diff --git a/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1 b/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
index 513fb0f451f8..4afc7e851d72 100644
--- a/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/network_interface-0.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/network_interface-0.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bec27f1f157d11e244c50d9291649769
diff --git a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2 b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
index 3277e6dece32..3f178902de5e 100644
--- a/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
+++ b/metadata/md5-cache/dev-ruby/niceogiri-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/niceogiri-1.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0d72687c9cfe99ac0c760a4c42a161a9
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.1.1 b/metadata/md5-cache/dev-ruby/nio4r-1.1.1
index b492ab557b31..aa3ee71aab8a 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.1.1
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd821eee8f431dcddb988429f33ba082
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.2.0 b/metadata/md5-cache/dev-ruby/nio4r-1.2.0
index 83ed0ac336a3..09ea46f2ab43 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.2.0
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4639ab213034c69dec0280e92cca5b48
diff --git a/metadata/md5-cache/dev-ruby/nio4r-1.2.1 b/metadata/md5-cache/dev-ruby/nio4r-1.2.1
index 76e4b0f65a50..2d24cfbe64fa 100644
--- a/metadata/md5-cache/dev-ruby/nio4r-1.2.1
+++ b/metadata/md5-cache/dev-ruby/nio4r-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nio4r-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aad4bcb4fa07739c0ece40a0016c12ca
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.4.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.4.1
index 38fe860617da..a72b71385fb2 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.4.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.4.1.tar.gz -> nokogiri-1.6.4.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c5d601420e07893403b1de1215273080
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
index 2cfd422a6aa4..c8c9263d1b86 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.6.2.tar.gz -> nokogiri-1.6.6.2-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5570a74fd7ac0cb8fcdb7a89a69e1cc3
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.4 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.4
index bf1a68262d07..0c054a60a496 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.4
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.6.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.6.4.tar.gz -> nokogiri-1.6.6.4-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75454449f49d5a6290a655605829f7ea
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.7.1 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.7.1
index a45e8273b0d0..6ab769146ecd 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.7.1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.7.1.tar.gz -> nokogiri-1.6.7.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c82dcca3822f7c4890b519fb813cac7f
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.6.7.2 b/metadata/md5-cache/dev-ruby/nokogiri-1.6.7.2
index 85a8285bab50..4f8db127e947 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.6.7.2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.6.7.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.2:= dev-libs/libxslt virtual/libiconv ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.6.7.2.tar.gz -> nokogiri-1.6.7.2-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91f512b86a0cb84e0450d1a845b962ce
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r1 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r1
index 7e4b3506b138..43e8828930ff 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogiri-diff-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2b970cd7d5dae0836ee99001027ea30
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2 b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
index 2b08d87b8bb9..456a895e3ec2 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.5[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogiri-diff-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a506172c9ee71754c6b127faf047361
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.1 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.1
index 3f5c4f80d09b..8f9a9f47b695 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.1
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.6.5-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c65acd12399ab9f7505989eba1b837c2
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.6 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.6
index bdcca68f33d0..d80e2d5bfc6a 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.6
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6.5-r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.4.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4af285ab5f4a76540a15cbe19b15d30d
diff --git a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7 b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
index caec31d4b04e..de11f49473de 100644
--- a/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
+++ b/metadata/md5-cache/dev-ruby/nokogumbo-1.4.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gumbo-0.10 ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6.5-r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/nokogumbo-1.4.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f4ff31cc63d2da05e4659a223778176
diff --git a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1 b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
index e3856f574486..b0433278a14d 100644
--- a/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
+++ b/metadata/md5-cache/dev-ruby/notify-0.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libnotify ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/notify-0.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=39da40848fd8ca0f48a6d2e8fe1018fd
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r1 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r1
index 025b90bdf3c6..f97373ea55e0 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ntlm-http-0.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cefce6400f6263aa5662ab4705d2ca59
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index f166757990f8..0dd4d6335821 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ntlm-http-0.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4106bce25f8b9243c7a25e162228db0b
diff --git a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2 b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
index 5eca19bc8317..b920acdf850c 100644
--- a/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
+++ b/metadata/md5-cache/dev-ruby/oauth-0.4.7-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/oauth-0.4.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60d87a5b5e512eca288eaf1f04c6fe6e
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.0.0 b/metadata/md5-cache/dev-ruby/oauth2-1.0.0
index 560f5d7bbbbe..d5dd55bef33f 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.0.0
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby19] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/oauth2-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8da69c7f450cc5dbd4e337cb25fcf471
diff --git a/metadata/md5-cache/dev-ruby/oauth2-1.1.0 b/metadata/md5-cache/dev-ruby/oauth2-1.1.0
index 7768fc40556e..de78f7a78e98 100644
--- a/metadata/md5-cache/dev-ruby/oauth2-1.1.0
+++ b/metadata/md5-cache/dev-ruby/oauth2-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby20] >=dev
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/intridea/oauth2/archive/v1.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47de962be0ed1b41966f6fbe32da1a3c
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.2.0 b/metadata/md5-cache/dev-ruby/octokit-4.2.0
index b9f1e246d766..ec5cbb2bc8dc 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.2.0
+++ b/metadata/md5-cache/dev-ruby/octokit-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/sawyer-0.5.3[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.2.0.tar.gz -> octokit-4.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2342ab9703228c062d65b8c479897992
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.2.2-r1 b/metadata/md5-cache/dev-ruby/omniauth-1.2.2-r1
index 4464cd3830b5..98de5c0ca3ee 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.2.2-r1
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] dev-ruby/hashi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/omniauth-1.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0316d2ea1680e67b31f96b05ee2a5b92
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.3.1 b/metadata/md5-cache/dev-ruby/omniauth-1.3.1
index 03fe6edd898f..1fbff375f16d 100644
--- a/metadata/md5-cache/dev-ruby/omniauth-1.3.1
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] >=dev-ruby/h
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/intridea/omniauth/archive/v1.3.1.tar.gz -> omniauth-1.3.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e346bd71739acd429d61b217dc6d7ffc
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.3 b/metadata/md5-cache/dev-ruby/open4-1.3.3
index 21ac543da660..6c92a101ace6 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.3
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/open4-1.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4b04ac37c84c6c77bbd28cc1c435b41
diff --git a/metadata/md5-cache/dev-ruby/open4-1.3.4 b/metadata/md5-cache/dev-ruby/open4-1.3.4
index 3249d441fac5..a971bcaceadb 100644
--- a/metadata/md5-cache/dev-ruby/open4-1.3.4
+++ b/metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/open4-1.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=de0cddb03503affac38c0f2eb569722d
diff --git a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1 b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
index de3f1481e79f..2174006e3467 100644
--- a/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
+++ b/metadata/md5-cache/dev-ruby/openssl-ccm-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.2.1
 SRC_URI=mirror://rubygems/openssl-ccm-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fb59e59d484de56f159af32e8dd2572
diff --git a/metadata/md5-cache/dev-ruby/optionable-0.2.0 b/metadata/md5-cache/dev-ruby/optionable-0.2.0
index d8530b8fb033..0d2237ecbd33 100644
--- a/metadata/md5-cache/dev-ruby/optionable-0.2.0
+++ b/metadata/md5-cache/dev-ruby/optionable-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/optionable-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5dd0744cbb50cec6f9b0a8c175fcebef
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
index 362df7d361d1..2bde4130dfc8 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.12.tar.gz -> org-ruby-0.9.12.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=483ff95c5c1625d494918ceb64f9f4f2
diff --git a/metadata/md5-cache/dev-ruby/org-ruby-0.9.9 b/metadata/md5-cache/dev-ruby/org-ruby-0.9.9
index 2b7ed183921c..b15079257ea8 100644
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.9
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rubypants-0.2*:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/wallyqs/org-ruby/archive/version-0.9.9.tar.gz -> org-ruby-0.9.9.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e3dcf41cf7bbfd8bbf13689d4b58ee96
diff --git a/metadata/md5-cache/dev-ruby/origin-1.1.0 b/metadata/md5-cache/dev-ruby/origin-1.1.0
index 3aad95ad714f..5113ac08feff 100644
--- a/metadata/md5-cache/dev-ruby/origin-1.1.0
+++ b/metadata/md5-cache/dev-ruby/origin-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v1.1.0.tar.gz -> origin-1.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d31cd29355f4a3cfc0e267f837e22ba
diff --git a/metadata/md5-cache/dev-ruby/origin-2.1.1 b/metadata/md5-cache/dev-ruby/origin-2.1.1
index 48a0d97ae2d3..830a491baf4b 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.1.1
+++ b/metadata/md5-cache/dev-ruby/origin-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.1.1.tar.gz -> origin-2.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb0fd5b3398a346724d945d83a328056
diff --git a/metadata/md5-cache/dev-ruby/origin-2.2.0 b/metadata/md5-cache/dev-ruby/origin-2.2.0
index 81f28e41084e..fe031646ccf8 100644
--- a/metadata/md5-cache/dev-ruby/origin-2.2.0
+++ b/metadata/md5-cache/dev-ruby/origin-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mongoid/origin/archive/v2.2.0.tar.gz -> origin-2.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9e3873578169093554ced3d3d7c6eaa5
diff --git a/metadata/md5-cache/dev-ruby/ox-2.2.2 b/metadata/md5-cache/dev-ruby/ox-2.2.2
index 3c097b1ab15c..d426200142a4 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.2.2
+++ b/metadata/md5-cache/dev-ruby/ox-2.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.2.2.tar.gz -> ox-2.2.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a130970aa25ec3946b679854826ffa9
diff --git a/metadata/md5-cache/dev-ruby/ox-2.2.3 b/metadata/md5-cache/dev-ruby/ox-2.2.3
index 3df73c7cd531..34b1354b5177 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ox-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.2.3.tar.gz -> ox-2.2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=88ae149a4701cbae81e05006483e5137
diff --git a/metadata/md5-cache/dev-ruby/ox-2.2.4 b/metadata/md5-cache/dev-ruby/ox-2.2.4
index 360921b2f5d8..ba8a9a58196b 100644
--- a/metadata/md5-cache/dev-ruby/ox-2.2.4
+++ b/metadata/md5-cache/dev-ruby/ox-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ohler55/ox/archive/v2.2.4.tar.gz -> ox-2.2.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee353fb684f2c466821fd5c9eda20850
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.10-r2 b/metadata/md5-cache/dev-ruby/packetfu-1.1.10-r2
index fd20ec8d93e0..5d54fb4bcd71 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.10-r2
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.10-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pcaprub-0.9.2:*[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.1.10
 SRC_URI=mirror://rubygems/packetfu-1.1.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0adc267830240fa8685772ad6dfeb9c3
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1 b/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
index 6bd9764b0697..e0e321b3b58f 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/network_interface:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.1.11
 SRC_URI=mirror://rubygems/packetfu-1.1.11.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9b3419c4efdbffb6856381bbabc1686
diff --git a/metadata/md5-cache/dev-ruby/packetfu-1.1.9-r1 b/metadata/md5-cache/dev-ruby/packetfu-1.1.9-r1
index 3d18624adccf..5ba5908a6efe 100644
--- a/metadata/md5-cache/dev-ruby/packetfu-1.1.9-r1
+++ b/metadata/md5-cache/dev-ruby/packetfu-1.1.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pcaprub-0.9.2:*[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby21 )
 SLOT=1.1.9
 SRC_URI=mirror://rubygems/packetfu-1.1.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a8ab9bd6681bc55608577f071cce28e3
diff --git a/metadata/md5-cache/dev-ruby/paint-1.0.0 b/metadata/md5-cache/dev-ruby/paint-1.0.0
index a62fed5b0242..cbf9a96d619d 100644
--- a/metadata/md5-cache/dev-ruby/paint-1.0.0
+++ b/metadata/md5-cache/dev-ruby/paint-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v1.0.0.tar.gz -> paint-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=24fc7fefff0a543989bbc99597cd9213
diff --git a/metadata/md5-cache/dev-ruby/paint-1.0.1 b/metadata/md5-cache/dev-ruby/paint-1.0.1
index 3d6b7d2bd3e8..c89864614c2b 100644
--- a/metadata/md5-cache/dev-ruby/paint-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paint-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/janlelis/paint/archive/v1.0.1.tar.gz -> paint-1.0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8411760ad35140c510cd91b407ab7e45
diff --git a/metadata/md5-cache/dev-ruby/parser-2.3.0.4 b/metadata/md5-cache/dev-ruby/parser-2.3.0.4
index c9c1110ccc1c..8f4ae1ae844b 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.3.0.4
+++ b/metadata/md5-cache/dev-ruby/parser-2.3.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby20] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/parser-2.3.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcdd84ec23c6846d49953c618cb8b0f4
diff --git a/metadata/md5-cache/dev-ruby/parser-2.3.0.6 b/metadata/md5-cache/dev-ruby/parser-2.3.0.6
index 9043d7dbaab7..815f57a92b2b 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.3.0.6
+++ b/metadata/md5-cache/dev-ruby/parser-2.3.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ast-2.2:0[ruby_targets_ruby20] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/parser-2.3.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcdd84ec23c6846d49953c618cb8b0f4
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.6.1 b/metadata/md5-cache/dev-ruby/parslet-1.6.1
index 6301306252eb..af5b3c60b021 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.6.1
+++ b/metadata/md5-cache/dev-ruby/parslet-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/blankslate:2[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.6.1.tar.gz -> parslet-1.6.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=19987c508499d648b7f2f22fe77949e3
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.6.2 b/metadata/md5-cache/dev-ruby/parslet-1.6.2
index 2cddcd3cc5b1..afa664d13538 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.6.2
+++ b/metadata/md5-cache/dev-ruby/parslet-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/blankslate-2[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.6.2.tar.gz -> parslet-1.6.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6fb955da6bdf9fa800cceffb7262c61a
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.7.0 b/metadata/md5-cache/dev-ruby/parslet-1.7.0
index 295495ee87a3..2a548c24e4a0 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.7.0
+++ b/metadata/md5-cache/dev-ruby/parslet-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/blankslate-2[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.7.0.tar.gz -> parslet-1.7.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59d3d91eea28d6366b1176a690a18a2f
diff --git a/metadata/md5-cache/dev-ruby/parslet-1.7.1 b/metadata/md5-cache/dev-ruby/parslet-1.7.1
index 383c8d8d0306..afbd18768017 100644
--- a/metadata/md5-cache/dev-ruby/parslet-1.7.1
+++ b/metadata/md5-cache/dev-ruby/parslet-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/blankslate-2[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/kschiess/parslet/archive/1.7.1.tar.gz -> parslet-1.7.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59d3d91eea28d6366b1176a690a18a2f
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.18-r1 b/metadata/md5-cache/dev-ruby/patron-0.4.18-r1
index c71dc4f0f990..bd85ecdc07b1 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.18-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.18.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4cb86cd862b3d51ae58a801b315ab9e
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2 b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
index f0c115eb3849..5e977136f75e 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.18-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.18.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=257e51b76adf40bbabb01cbf4c6b069d
diff --git a/metadata/md5-cache/dev-ruby/patron-0.4.20 b/metadata/md5-cache/dev-ruby/patron-0.4.20
index fac969694018..a0165e124099 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.4.20
+++ b/metadata/md5-cache/dev-ruby/patron-0.4.20
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.4.20.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8607234b7370b03c235aab6feae756c5
diff --git a/metadata/md5-cache/dev-ruby/patron-0.5.0-r1 b/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
index 0c5aff0aac90..b491f56f6e08 100644
--- a/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/patron-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/patron-0.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e527f7b413f20852678590b540bce98e
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2 b/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
index c589a4d07781..db44c8ffdf09 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.11.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0.11
 SRC_URI=mirror://rubygems/pcaprub-0.11.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=218cf0c4eafd91827519ed469a77e4e3
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.12.0-r1 b/metadata/md5-cache/dev-ruby/pcaprub-0.12.0-r1
index 2cd16d6ef5f8..158ed8b98bac 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.12.0-r1
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.12.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0.12
 SRC_URI=mirror://rubygems/pcaprub-0.12.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a68d045929f68e714bd16d6869d642e4
diff --git a/metadata/md5-cache/dev-ruby/pcaprub-0.12.1 b/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
index d201a1495049..1aa820a4e86a 100644
--- a/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
+++ b/metadata/md5-cache/dev-ruby/pcaprub-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ru
 RESTRICT=test
 SLOT=0.12
 SRC_URI=mirror://rubygems/pcaprub-0.12.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b6f4207c74bc21acd9d1fc37b066c12
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.5.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.5.0
deleted file mode 100644
index 729e2515fb54..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby19] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby19] =dev-ruby/pdf-reader-1*[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby20] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby20] =dev-ruby/pdf-reader-1*[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] =dev-ruby/pdf-reader-1*[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] ) )
-DESCRIPTION=Implements low level PDF features for Prawn
-EAPI=5
-HOMEPAGE=https://github.com/prawnpdf/pdf-core/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Ruby GPL-2 GPL-3 )
-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 )
-SLOT=0
-SRC_URI=mirror://rubygems/pdf-core-0.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=95b5229dc3c64dbce3f8f2cd25647a75
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.5.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.5.1
deleted file mode 100644
index bc0e48ab038a..000000000000
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby19] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby19] =dev-ruby/pdf-reader-1*[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby20] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby20] =dev-ruby/pdf-reader-1*[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] =dev-ruby/pdf-reader-1*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-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? ( 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] ) )
-DESCRIPTION=Implements low level PDF features for Prawn
-EAPI=5
-HOMEPAGE=https://github.com/prawnpdf/pdf-core/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Ruby GPL-2 GPL-3 )
-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 )
-SLOT=0
-SRC_URI=mirror://rubygems/pdf-core-0.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a1988fb001ef9221d8ffe96d11557d64
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.6.0 b/metadata/md5-cache/dev-ruby/pdf-core-0.6.0
index 8625522c1f0a..0ea75826dc3d 100644
--- a/metadata/md5-cache/dev-ruby/pdf-core-0.6.0
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-core-0.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1988fb001ef9221d8ffe96d11557d64
diff --git a/metadata/md5-cache/dev-ruby/pdf-core-0.6.1 b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
new file mode 100644
index 000000000000..6191843d12d5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pdf-core-0.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby20] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby20] =dev-ruby/pdf-reader-1*[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby21] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby21] =dev-ruby/pdf-reader-1*[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( =dev-ruby/pdf-inspector-1.1*[ruby_targets_ruby22] >=dev-ruby/pdf-reader-1.2[ruby_targets_ruby22] =dev-ruby/pdf-reader-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? ( 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=Implements low level PDF features for Prawn
+EAPI=5
+HOMEPAGE=https://github.com/prawnpdf/pdf-core/
+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=|| ( Ruby GPL-2 GPL-3 )
+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/pdf-core-0.6.1.gem
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=840af347aff3437bca3b48747975203b
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
index 81f38b60275c..686db7e8bc0a 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=142aa2100637527621f4ef16219bacc9
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
index 15595dedcfdc..a17feff5ee0b 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20c76014c1c52d4149279096d7882e53
diff --git a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1 b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
index cce04d683863..71fccdffb76c 100644
--- a/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
+++ b/metadata/md5-cache/dev-ruby/pdf-inspector-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/pdf-reader-1.0[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pdf-inspector-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e642e578c191df89670a845333e08025
diff --git a/metadata/md5-cache/dev-ruby/pdf-reader-1.3.3 b/metadata/md5-cache/dev-ruby/pdf-reader-1.3.3
index 1b6a26d5397f..a54081763a0a 100644
--- a/metadata/md5-cache/dev-ruby/pdf-reader-1.3.3
+++ b/metadata/md5-cache/dev-ruby/pdf-reader-1.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/afm[ruby_targets_ruby19] dev-ruby/ascii8
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/yob/pdf-reader/tarball/v1.3.3 -> pdf-reader-git-1.3.3.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e21e305586a58ebc50df89e6d67affc
diff --git a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1 b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
index 4a95b1649085..22e706def194 100644
--- a/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
+++ b/metadata/md5-cache/dev-ruby/permutation-0.1.8-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/permutation-0.1.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8efadc70372be405eafa8c31a49ebf5c
diff --git a/metadata/md5-cache/dev-ruby/pg-0.17.1 b/metadata/md5-cache/dev-ruby/pg-0.17.1
index 65035782387e..574739a0d288 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.17.1
+++ b/metadata/md5-cache/dev-ruby/pg-0.17.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.17.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb1af5dd072b69a77aad02e805d8a9a0
diff --git a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1 b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
index 991ef15ce7b9..e3a8f8e6a81d 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
+++ b/metadata/md5-cache/dev-ruby/pg-0.17.1-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.17.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f243c55cbd5ae70da3ab55c555087af6
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.2 b/metadata/md5-cache/dev-ruby/pg-0.18.2
index f3e6ede91668..f21249975d64 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.18.2
+++ b/metadata/md5-cache/dev-ruby/pg-0.18.2
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.18.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=005800752a02267bd86d161962e1684d
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.3 b/metadata/md5-cache/dev-ruby/pg-0.18.3
index 95d3e6d9a9df..ca3b50755a20 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.18.3
+++ b/metadata/md5-cache/dev-ruby/pg-0.18.3
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.18.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=005800752a02267bd86d161962e1684d
diff --git a/metadata/md5-cache/dev-ruby/pg-0.18.4 b/metadata/md5-cache/dev-ruby/pg-0.18.4
index a647bf98d64e..6fa277fb140c 100644
--- a/metadata/md5-cache/dev-ruby/pg-0.18.4
+++ b/metadata/md5-cache/dev-ruby/pg-0.18.4
@@ -10,5 +10,5 @@ RDEPEND=dev-db/postgresql ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pg-0.18.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=005800752a02267bd86d161962e1684d
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 4acc93c72113..91b7f5fef348 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
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1525a1562f94d1d115e2d87adbb925f6
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.6 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
index 189a4195b0a1..831c03478fa5 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a050eb4b190c6c8bb6533580e072977
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.1.7 b/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
index 0e5cfaf27e3a..0b0a8de27b46 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pkg-config-1.1.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=198e306a58c56793dd7e0702e471df99
diff --git a/metadata/md5-cache/dev-ruby/plist-3.1.0-r1 b/metadata/md5-cache/dev-ruby/plist-3.1.0-r1
index b73c1e95ce1b..ac4ec5bc8317 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/plist-3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/plist-3.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f6f9213d89e312fbd99024152dba339d
diff --git a/metadata/md5-cache/dev-ruby/plist-3.2.0 b/metadata/md5-cache/dev-ruby/plist-3.2.0
index e04a95a79b21..ab853352e19d 100644
--- a/metadata/md5-cache/dev-ruby/plist-3.2.0
+++ b/metadata/md5-cache/dev-ruby/plist-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/plist-3.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=736f6733fdb2cff839f2fcd0a0cd0471
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2 b/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
index 0cbbb5baa4bd..5f3f38be0fb1 100644
--- a/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/delayer[ruby_targets_ruby20] dev-ruby/in
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/pluggaloid-1.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d26dff1f234ffa69da2c356fcc82f102
diff --git a/metadata/md5-cache/dev-ruby/png-1.2.0-r2 b/metadata/md5-cache/dev-ruby/png-1.2.0-r2
index 3f319ca437df..fc2734c298ea 100644
--- a/metadata/md5-cache/dev-ruby/png-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/png-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/png-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c70d8edf6eca1e4db2007e5dd68f2f85
diff --git a/metadata/md5-cache/dev-ruby/png-1.2.1 b/metadata/md5-cache/dev-ruby/png-1.2.1
index 332d7484709a..ff3e0bd1b38d 100644
--- a/metadata/md5-cache/dev-ruby/png-1.2.1
+++ b/metadata/md5-cache/dev-ruby/png-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/RubyInline-3.5.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/png-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8cd2bbd9ffa0fe717a69a2c0eb2a333c
diff --git a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2 b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
index 229c068a6c41..c062ee56730f 100644
--- a/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/podcast-0.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ruby-mp3info[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/podcast-0.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da2b3617a7bec102c60e2c13437838b7
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.6.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.6.0
index 6d9e33d2854d..0d7838a11468 100644
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.6.0
+++ b/metadata/md5-cache/dev-ruby/poltergeist-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=www-client/phantomjs ruby_targets_ruby19? ( >=dev-ruby/cliver-0.3.1[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jonleighton/poltergeist/archive/v1.6.0.tar.gz -> poltergeist-1.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df04374e127df092ecddde2c36a91de2
diff --git a/metadata/md5-cache/dev-ruby/poltergeist-1.7.0 b/metadata/md5-cache/dev-ruby/poltergeist-1.7.0
index b0bad85afac8..9868b545af62 100644
--- a/metadata/md5-cache/dev-ruby/poltergeist-1.7.0
+++ b/metadata/md5-cache/dev-ruby/poltergeist-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=www-client/phantomjs ruby_targets_ruby19? ( >=dev-ruby/cliver-0.3.1[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jonleighton/poltergeist/archive/v1.7.0.tar.gz -> poltergeist-1.7.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=575299f6542109119cbbff724dab5808
diff --git a/metadata/md5-cache/dev-ruby/polyglot-0.3.5 b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
index fef7739ae7dd..08d1e1760f74 100644
--- a/metadata/md5-cache/dev-ruby/polyglot-0.3.5
+++ b/metadata/md5-cache/dev-ruby/polyglot-0.3.5
@@ -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? ( 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_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] ) 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=Polyglot provides support for fully-custom DSLs
 EAPI=5
 HOMEPAGE=http://polyglot.rubyforge.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 ruby_targets_ruby23 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=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_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=mirror://rubygems/polyglot-0.3.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fd0c4cf4f50b4c40eac92f5fd2bb52d5
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=159badecce01b6f8000c0a9279ebe8b1
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.10 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.10
index 4f701014b29d..eb81267ae744 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.10
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73b931b86cfe5bd1875f5c9cbeb3f5f7
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
index 7e03817031c4..646d943f8516 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.11.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73b931b86cfe5bd1875f5c9cbeb3f5f7
diff --git a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.9 b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.9
index bc830138ca2e..688465b898ef 100644
--- a/metadata/md5-cache/dev-ruby/posix-spawn-0.3.9
+++ b/metadata/md5-cache/dev-ruby/posix-spawn-0.3.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/posix-spawn-0.3.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59bf46bd7995b8e4721e6e496257801e
diff --git a/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1 b/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
index 303d4da2be34..3c9f53876deb 100644
--- a/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
+++ b/metadata/md5-cache/dev-ruby/postgres_ext-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=2.4
 SRC_URI=mirror://rubygems/postgres_ext-2.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85e14a60b308e9f07c00fa1fa02a3183
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.2.6 b/metadata/md5-cache/dev-ruby/power_assert-0.2.6
index 2639634f8abf..8f67c97a32dd 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-0.2.6
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.2.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/power_assert-0.2.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=879609ed4bda1eb2ec9e91a22fd01929
diff --git a/metadata/md5-cache/dev-ruby/power_assert-0.2.7 b/metadata/md5-cache/dev-ruby/power_assert-0.2.7
index 20bea64f872e..c6c3521cd5d1 100644
--- a/metadata/md5-cache/dev-ruby/power_assert-0.2.7
+++ b/metadata/md5-cache/dev-ruby/power_assert-0.2.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/power_assert-0.2.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f99ac970405e0c460b4b5217902c9e2
diff --git a/metadata/md5-cache/dev-ruby/prawn-1.2.1-r2 b/metadata/md5-cache/dev-ruby/prawn-1.2.1-r2
index e38a55a0fbbf..05bba4d8e002 100644
--- a/metadata/md5-cache/dev-ruby/prawn-1.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/prawn-1.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/pdf-core[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/prawnpdf/prawn/archive/1.2.1.tar.gz -> prawn-1.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e1a5a9592ad348cb3ffe1f11242a6d07
diff --git a/metadata/md5-cache/dev-ruby/prawn-1.3.0 b/metadata/md5-cache/dev-ruby/prawn-1.3.0
index efe39bbb7441..5041edb4e093 100644
--- a/metadata/md5-cache/dev-ruby/prawn-1.3.0
+++ b/metadata/md5-cache/dev-ruby/prawn-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.4.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=245ed20069276630de1eef5d45ac007b
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.0.1 b/metadata/md5-cache/dev-ruby/prawn-2.0.1
index 3eae02fe8c81..592823718e37 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.0.1
+++ b/metadata/md5-cache/dev-ruby/prawn-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.5.1[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/prawnpdf/prawn/archive/2.0.1.tar.gz -> prawn-2.0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d59343c11b598218d30027b93da534a2
diff --git a/metadata/md5-cache/dev-ruby/prawn-2.0.2 b/metadata/md5-cache/dev-ruby/prawn-2.0.2
index a62ea9e9dc25..0008c6a27ea5 100644
--- a/metadata/md5-cache/dev-ruby/prawn-2.0.2
+++ b/metadata/md5-cache/dev-ruby/prawn-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/pdf-core-0.6.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4349083259c3b31e0cdef97f3ee664b
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.1 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
index e5eb807b43f1..4bf861b28d40 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/prawn-table-0.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b43baafa115d4a31e16e849d0ee43b81
diff --git a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2 b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
index 922c60edd44c..c4783034fd3c 100644
--- a/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
+++ b/metadata/md5-cache/dev-ruby/prawn-table-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/prawn-table-0.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b43baafa115d4a31e16e849d0ee43b81
diff --git a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2 b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
index 6e6f6e260803..e17837ed640d 100644
--- a/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
+++ b/metadata/md5-cache/dev-ruby/priorityqueue-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/PriorityQueue-0.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3229b8e7e57cccb5320031e0487eb52b
diff --git a/metadata/md5-cache/dev-ruby/protected_attributes-1.1.3 b/metadata/md5-cache/dev-ruby/protected_attributes-1.1.3
index ddf1a6a27fab..94bef2b137ad 100644
--- a/metadata/md5-cache/dev-ruby/protected_attributes-1.1.3
+++ b/metadata/md5-cache/dev-ruby/protected_attributes-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/activemodel-4*:*[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=https://github.com/rails/protected_attributes/archive/v1.1.3.tar.gz -> protected_attributes-1.1.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae41cfd5ca8ef0a551bd9e3af7ac1c51
diff --git a/metadata/md5-cache/dev-ruby/pry-0.10.1 b/metadata/md5-cache/dev-ruby/pry-0.10.1
index 6c35063e492f..7e381a7bc5ce 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.10.1
+++ b/metadata/md5-cache/dev-ruby/pry-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.10.1.tar.gz -> pry-0.10.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64e0f88b1d4a5ab7d0a3dda6ae8d2ac4
diff --git a/metadata/md5-cache/dev-ruby/pry-0.10.2 b/metadata/md5-cache/dev-ruby/pry-0.10.2
index d7850574a2f5..c1b4c20d64d8 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.10.2
+++ b/metadata/md5-cache/dev-ruby/pry-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby19] =de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.10.2.tar.gz -> pry-0.10.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdbd5959c6f10125b04d4b35ed014534
diff --git a/metadata/md5-cache/dev-ruby/pry-0.10.3 b/metadata/md5-cache/dev-ruby/pry-0.10.3
index e0ef62a6f6ea..7fcd847b4b96 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.10.3
+++ b/metadata/md5-cache/dev-ruby/pry-0.10.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coderay-1.1.0[ruby_targets_ruby19] =de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=ruby19
 SRC_URI=https://github.com/pry/pry/archive/v0.10.3.tar.gz -> pry-0.10.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdbd5959c6f10125b04d4b35ed014534
diff --git a/metadata/md5-cache/dev-ruby/pry-0.9.12.6-r1 b/metadata/md5-cache/dev-ruby/pry-0.9.12.6-r1
index 2ed98fbf712e..c36fc1b2990e 100644
--- a/metadata/md5-cache/dev-ruby/pry-0.9.12.6-r1
+++ b/metadata/md5-cache/dev-ruby/pry-0.9.12.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/coderay-1.0.5[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=ruby19
 SRC_URI=mirror://rubygems/pry-0.9.12.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f213ef30261e598dfdad462fbacdf9fb
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.15 b/metadata/md5-cache/dev-ruby/psych-2.0.15
index cccf0c5dab02..fa4e751797d5 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.0.15
+++ b/metadata/md5-cache/dev-ruby/psych-2.0.15
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/psych-2.0.15.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4d5e80487d238edf78535b38d1157ae
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.16 b/metadata/md5-cache/dev-ruby/psych-2.0.16
index a29372cddea6..15d19f0afd93 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.0.16
+++ b/metadata/md5-cache/dev-ruby/psych-2.0.16
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/psych-2.0.16.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac504b7832d223955bda874f49d85d89
diff --git a/metadata/md5-cache/dev-ruby/psych-2.0.17 b/metadata/md5-cache/dev-ruby/psych-2.0.17
index cd4f71e91c96..d316315eaa9e 100644
--- a/metadata/md5-cache/dev-ruby/psych-2.0.17
+++ b/metadata/md5-cache/dev-ruby/psych-2.0.17
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/psych-2.0.17.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac504b7832d223955bda874f49d85d89
diff --git a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2 b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
index 24029ef083a3..31026618d321 100644
--- a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
+++ b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby20] dev
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pusher-client-0.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=123a4cb3a80c3622af018486e19d151f
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.2 b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.2
index 4714912b3a0b..30e4a18ccbf4 100644
--- a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.2
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_j
 REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/pygments.rb-0.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f6999fd1b1a62044737c6f3812fbaf81
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3 b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
index 2543e21a17f4..8d21e9dfae5e 100644
--- a/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_j
 REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/pygments.rb-0.6.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1203d0046be4e238173ea2cf8c54402
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.1 b/metadata/md5-cache/dev-ruby/qed-2.9.1
index deacc9b347a7..8f82c9943ef5 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.1
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] dev-ruby/brass
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/qed-2.9.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97adcbc99503057c5973ae6425f9b21a
diff --git a/metadata/md5-cache/dev-ruby/qed-2.9.2 b/metadata/md5-cache/dev-ruby/qed-2.9.2
index 5d736b68c20f..472f1fa8b586 100644
--- a/metadata/md5-cache/dev-ruby/qed-2.9.2
+++ b/metadata/md5-cache/dev-ruby/qed-2.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] dev-ruby/brass
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/qed-2.9.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2363c9119e572a7a2334e8bf32aedfb
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.11 b/metadata/md5-cache/dev-ruby/racc-1.4.11
index f531beeba0c3..c5a6d6db7adf 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.11
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.11
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.11.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3dedf84da183afd41afe3ad8d96074a1
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.12 b/metadata/md5-cache/dev-ruby/racc-1.4.12
index 4d10158abf68..56bfa27a69ef 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.12
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3032c78deeffbc9477f4e047f9526fd0
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.13 b/metadata/md5-cache/dev-ruby/racc-1.4.13
index 18f613177c38..73485c814b2a 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.13
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1afb8f4cc408994cd37127eed0e1fc4
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.14 b/metadata/md5-cache/dev-ruby/racc-1.4.14
index 76601b072942..0cf97df468c6 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.14
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.14.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f01e8eb0f216a8599e4eeec4e7dfaee6
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.7 b/metadata/md5-cache/dev-ruby/rack-1.4.7
index 2828ae4a51d9..97f687fcb442 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.7
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=mirror://rubygems/rack-1.4.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a9a7c32dea9ef71668be113a09f26e3
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.5 b/metadata/md5-cache/dev-ruby/rack-1.5.5
index c2d8fcd6309e..019eeac9b237 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.5
 SRC_URI=mirror://rubygems/rack-1.5.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55fe47749efa7e88915a3ce3bd9cc99b
diff --git a/metadata/md5-cache/dev-ruby/rack-1.6.4 b/metadata/md5-cache/dev-ruby/rack-1.6.4
index 168bb5c16161..9de188f55174 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.6.4
+++ b/metadata/md5-cache/dev-ruby/rack-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.6
 SRC_URI=mirror://rubygems/rack-1.6.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bc67810dc9e7b4167717eb3e72655f0
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.3.1 b/metadata/md5-cache/dev-ruby/rack-attack-4.3.1
index eee4316135a3..5ced33cec781 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.3.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	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
index 6085fbae49ff..98e9e389c163 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.4.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a0575036981a9447dd95a39ef286cda
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.4.1 b/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
index 181ebe14faf0..82610a164ce3 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rack-attack-4.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a0575036981a9447dd95a39ef286cda
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.3.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.3.0
index 793ae4195a8d..5d53de1f420d 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.3.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack:*[ruby_targets_ruby19] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.3.0.tar.gz -> rack-cache-1.3.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c7775448afd8061349e156acbf97b18
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.5.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.5.1
index a073bf34be5e..f7a364cebcb0 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.5.1.tar.gz -> rack-cache-1.5.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=020daea5009f076fe5d65ac5ba692b9e
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.6.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.6.0
index 62b2413c0220..c8c786bea2d4 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.6.0
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.6.0.tar.gz -> rack-cache-1.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=599958b29740b25d7d2728c3ee95fff7
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
index 5a9922795810..6aa988b67235 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.6.1.tar.gz -> rack-cache-1.6.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=599958b29740b25d7d2728c3ee95fff7
diff --git a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2 b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
index 1542bae5d16d..da22fe00315c 100644
--- a/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
+++ b/metadata/md5-cache/dev-ruby/rack-mount-0.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rack-1.0.0[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=https://github.com/josh/rack-mount/tarball/v0.8.3 -> rack-mount-0.8.3.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ade9e45a98e79662fc1dfccc1da3bcf
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 f554dbd7dda5..3ffd50fe51e2 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.3.1
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rack-openid-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d695ed59a54b2678564e895ca2faf942
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 a403abcef395..55b512e3c61d 100644
--- a/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
+++ b/metadata/md5-cache/dev-ruby/rack-openid-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-openid-2.1.8[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=200796c4459f6888d92a22879585bf2b
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3 b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3
index 19c5e01377e6..88f34e9caf13 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3
+++ b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=1
 SRC_URI=mirror://rubygems/rack-protection-1.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=949f5426455538b72a989960f687d22a
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1 b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
index 4d7b4696a8ba..d090afebd1cd 100644
--- a/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
+++ b/metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/rack-protection-1.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=48710e9396257f2e2089a2578479c518
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4 b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
index e488a7428882..122b46ebf940 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.3
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.3.4.tar.gz -> rack-ssl-1.3.4-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ca068ba6c4e29be9252d9e2b14c59de
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
index 2c545ed2ca38..fcc8e3bcad99 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.1.tar.gz -> rack-ssl-1.4.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ca068ba6c4e29be9252d9e2b14c59de
diff --git a/metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1 b/metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1
index 6b6a34d955a1..5382bdf9bc36 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1
+++ b/metadata/md5-cache/dev-ruby/rack-test-0.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rack-1.0[ruby_targets_ruby19] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/rack-test-0.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1efe7871b049c991af98391fff1d7d9
diff --git a/metadata/md5-cache/dev-ruby/rack-test-0.6.3 b/metadata/md5-cache/dev-ruby/rack-test-0.6.3
index ed3e736a76a4..22aafc7fbff5 100644
--- a/metadata/md5-cache/dev-ruby/rack-test-0.6.3
+++ b/metadata/md5-cache/dev-ruby/rack-test-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rack-1.0:*[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.6
 SRC_URI=mirror://rubygems/rack-test-0.6.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9779f8f65e7ed8ec6208da9fec38b326
diff --git a/metadata/md5-cache/dev-ruby/radius-0.7.4-r2 b/metadata/md5-cache/dev-ruby/radius-0.7.4-r2
index 96dd7ff8ccce..1bfd062bd4cc 100644
--- a/metadata/md5-cache/dev-ruby/radius-0.7.4-r2
+++ b/metadata/md5-cache/dev-ruby/radius-0.7.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/radius-0.7.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1215cfe8e637d198628d649e44e0d46e
diff --git a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1 b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1
index 192ce9115f78..f5715196376c 100644
--- a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] ) rub
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	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 058c69ec5eda..c4554cf10b37 100644
--- a/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ced70dcad68b67023710d4e3bd0856a
diff --git a/metadata/md5-cache/dev-ruby/rails-3.2.22.1 b/metadata/md5-cache/dev-ruby/rails-3.2.22.1
index 1f64affe18ed..d2bf5c775a4d 100644
--- a/metadata/md5-cache/dev-ruby/rails-3.2.22.1
+++ b/metadata/md5-cache/dev-ruby/rails-3.2.22.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-3.2.22.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.2
 SRC_URI=mirror://rubygems/rails-3.2.22.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d0552eb9f03aea75803c85a10241a03
diff --git a/metadata/md5-cache/dev-ruby/rails-4.0.13 b/metadata/md5-cache/dev-ruby/rails-4.0.13
index 06a042d18798..149b931d0f74 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.0.13
+++ b/metadata/md5-cache/dev-ruby/rails-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( ~dev-ruby/actionmailer-4.0.13[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.0
 SRC_URI=mirror://rubygems/rails-4.0.13.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26ed713787fbb93aeddd6bfb365c72bd
diff --git a/metadata/md5-cache/dev-ruby/rails-4.1.14.1 b/metadata/md5-cache/dev-ruby/rails-4.1.14.1
index 658bbfcdb698..e5a8c8d5f721 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.1.14.1
+++ b/metadata/md5-cache/dev-ruby/rails-4.1.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/actionmailer-4.1.14.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=4.1
 SRC_URI=mirror://rubygems/rails-4.1.14.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c90b65924036de5d928c16002552308d
diff --git a/metadata/md5-cache/dev-ruby/rails-4.2.5.1 b/metadata/md5-cache/dev-ruby/rails-4.2.5.1
index 406df138629e..da9b2fabf683 100644
--- a/metadata/md5-cache/dev-ruby/rails-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/rails-4.2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( ~dev-ruby/actionmailer-4.2.5.1[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4.2
 SRC_URI=mirror://rubygems/rails-4.2.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=939717d872e2af454b4cf5defd33729a
diff --git a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
index 54dafeb70d56..043ebbf5b78d 100644
--- a/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-deprecated_sanitizer-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rails-deprecated_sanitizer-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=458360acf3ef822a33c3a8727448fd89
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7 b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7
index 911bce557c60..76553afd5ac2 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/activesupport:4.2[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-dom-testing-1.0.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4dea67206f13ed8a6b9c154b36daca3
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
index 2a6553de8578..1e3d808cb778 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/loofah:0[ruby_targets_ruby20] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=781d97b80da56345fb1ff4798da356e4
diff --git a/metadata/md5-cache/dev-ruby/rails-observers-0.1.2 b/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
index 0f611949445a..ff263417b65f 100644
--- a/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
+++ b/metadata/md5-cache/dev-ruby/rails-observers-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/activemodel-4*[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0.1
 SRC_URI=https://github.com/rails/rails-observers/archive/v0.1.2.tar.gz -> rails-observers-0.1.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1d5e2f9506907855b937b68f125f6d0
diff --git a/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6 b/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
index f3c7c79a3764..53a179fa4797 100644
--- a/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
+++ b/metadata/md5-cache/dev-ruby/rails_autolink-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rails-3.1[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rails_autolink-1.1.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f946308f134f01917c1b1baeef73319
diff --git a/metadata/md5-cache/dev-ruby/railties-3.2.22.1 b/metadata/md5-cache/dev-ruby/railties-3.2.22.1
index 3ea121ddef57..b90359434eab 100644
--- a/metadata/md5-cache/dev-ruby/railties-3.2.22.1
+++ b/metadata/md5-cache/dev-ruby/railties-3.2.22.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=3.2
 SRC_URI=https://github.com/rails/rails/archive/v3.2.22.1.tar.gz -> rails-3.2.22.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74dad846b18b8005116a0dda712e2ea6
diff --git a/metadata/md5-cache/dev-ruby/railties-4.0.13 b/metadata/md5-cache/dev-ruby/railties-4.0.13
index ec8e18c3cedc..3ed182f0d210 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.0.13
+++ b/metadata/md5-cache/dev-ruby/railties-4.0.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.0
 SRC_URI=https://github.com/rails/rails/archive/v4.0.13.tar.gz -> rails-4.0.13.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=351788a438d1feb7392fab6d2d9e2d12
diff --git a/metadata/md5-cache/dev-ruby/railties-4.1.14.1 b/metadata/md5-cache/dev-ruby/railties-4.1.14.1
index 2c0197d4af21..8bd1ae424735 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.1.14.1
+++ b/metadata/md5-cache/dev-ruby/railties-4.1.14.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.14.1.tar.gz -> rails-4.1.14.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cb310c241c56f853348ee4f3e3fae941
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.5.1 b/metadata/md5-cache/dev-ruby/railties-4.2.5.1
index 6f58962bd3f5..b4a18e459f32 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.5.1
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.5.1.tar.gz -> rails-4.2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c0da20fee843889ed1a82671a38a6f65
diff --git a/metadata/md5-cache/dev-ruby/rainbow-1.1.4 b/metadata/md5-cache/dev-ruby/rainbow-1.1.4
index 8f83248ee9b9..22ed53d4ecc4 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-1.1.4
+++ b/metadata/md5-cache/dev-ruby/rainbow-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/sickill/rainbow/archive/v1.1.4.tar.gz -> rainbow-git-1.1.4.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29ec3269c0810c642d8e486134cc202b
diff --git a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1 b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
index e230fab3f4d3..13eada13afcb 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/rainbow-1.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/sickill/rainbow/archive/v1.1.4.tar.gz -> rainbow-git-1.1.4.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ba7014838966be8af93187ce6d220f4
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.0.0 b/metadata/md5-cache/dev-ruby/rainbow-2.0.0
index 9ba46df562fa..34425f676529 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.0.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.0.0.tar.gz -> rainbow-git-2.0.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5f896b502d787d108c47e4f7534f9c0
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1 b/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
index 88d0a96d48b9..523bb7066207 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.0.0.tar.gz -> rainbow-git-2.0.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3811183aed29f3bbd21144a6d3e11b69
diff --git a/metadata/md5-cache/dev-ruby/rainbow-2.1.0 b/metadata/md5-cache/dev-ruby/rainbow-2.1.0
index 3b61a066e1ce..2f7f256aef7d 100644
--- a/metadata/md5-cache/dev-ruby/rainbow-2.1.0
+++ b/metadata/md5-cache/dev-ruby/rainbow-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/sickill/rainbow/archive/v2.1.0.tar.gz -> rainbow-git-2.1.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a6c235417fb623c61c9da96313196a64
diff --git a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1 b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
index 5c7193c4c786..ea100dfba441 100644
--- a/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
+++ b/metadata/md5-cache/dev-ruby/rake-0.9.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-0.9.6.gem
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b76ad71e34701e2773bd9152ff6eed4e
diff --git a/metadata/md5-cache/dev-ruby/rake-10.3.2 b/metadata/md5-cache/dev-ruby/rake-10.3.2
index 490610c44873..1e6eb029fd69 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.3.2
+++ b/metadata/md5-cache/dev-ruby/rake-10.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-10.3.2.gem
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3be387bcfb517a14c8e1f4fcf6e19919
diff --git a/metadata/md5-cache/dev-ruby/rake-10.4.0 b/metadata/md5-cache/dev-ruby/rake-10.4.0
index b851b89107e8..580cdb0caa70 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.4.0
+++ b/metadata/md5-cache/dev-ruby/rake-10.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-10.4.0.gem
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c57954000eafaf42dbee8a138ab1798e
diff --git a/metadata/md5-cache/dev-ruby/rake-10.4.2 b/metadata/md5-cache/dev-ruby/rake-10.4.2
index 502af2ca96f0..d83815eedd44 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.4.2
+++ b/metadata/md5-cache/dev-ruby/rake-10.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-10.4.2.gem
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=576dff3c0808da66739dde773981a00d
diff --git a/metadata/md5-cache/dev-ruby/rake-10.5.0 b/metadata/md5-cache/dev-ruby/rake-10.5.0
index 76e41533cb26..74034fde536c 100644
--- a/metadata/md5-cache/dev-ruby/rake-10.5.0
+++ b/metadata/md5-cache/dev-ruby/rake-10.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-10.5.0.gem
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9efbbd548eaf1bb7708408ff5c56003
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2 b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2
index 91c2f3e0d993..add99d5de60f 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/tarball/v0.9.2 -> rake-compiler-0.9.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40cf2d35a17cc66b84e390409ace8873
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1 b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
index 95b8190003d0..6886aa34a2f7 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/tarball/v0.9.2 -> rake-compiler-0.9.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=948613e396e44641c6230e7341954968
diff --git a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.5 b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.5
index 747a4d2c447e..e6fcda5e3155 100644
--- a/metadata/md5-cache/dev-ruby/rake-compiler-0.9.5
+++ b/metadata/md5-cache/dev-ruby/rake-compiler-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/luislavena/rake-compiler/archive/v0.9.5.tar.gz -> rake-compiler-0.9.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a17f6776581146de601057edcf26876
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.3.0 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.3.0
index 2576f40e73d2..683b6737db53 100644
--- a/metadata/md5-cache/dev-ruby/rake-remote_task-2.3.0
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/open4-1.0[ruby_targets_ruby19] ) ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rake-remote_task-2.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fcd1a444cb89a7231d575f6cef6501fb
diff --git a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2 b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
index 3e74efdef773..4b765bd35e92 100644
--- a/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
+++ b/metadata/md5-cache/dev-ruby/rash-0.4.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hashie-2.0.0:0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rash-0.4.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=648fd7b55ff96a6aee8e90cccdc9fb0f
diff --git a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6 b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
index 76a34786d111..154eec927557 100644
--- a/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
+++ b/metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/gsl-1.15 <sci-libs/gsl-2.1 ruby_targets_ruby20? ( dev-ruby/na
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/gsl-1.16.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58a328a5267396914af5a170849dcb75
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5
index 3efb80921a4c..0402b1853a0b 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a38d976d137ecf87c4bdcdbbc6af250a
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
index b4b887f04f10..4f913e47abfa 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ffi[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4bcf3c66d9473f89c216336a192c526
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.6 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.6
index 9131868f5469..3718930c4167 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.6
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ffi[ruby_targets_ruby20] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1bbf6aff42f1a7fe9bd148f36474b2a
diff --git a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.7 b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.7
index b40eb0375b54..22b2e80f4902 100644
--- a/metadata/md5-cache/dev-ruby/rb-inotify-0.9.7
+++ b/metadata/md5-cache/dev-ruby/rb-inotify-0.9.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ffi[ruby_targets_ruby20] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-inotify-0.9.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1bbf6aff42f1a7fe9bd148f36474b2a
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.1 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.1
index cfb1f3241301..dc173e3d56b7 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.1
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b215c807ed0fa6eebbfd7ca71a8f38a
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.2 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.2
index e19942781b51..b32fcf52c5a5 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.2
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3b956fe57856fa753138c2097fca8c3
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-0.5.3 b/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
index 9dee03552401..632dc8b6721b 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
+++ b/metadata/md5-cache/dev-ruby/rb-readline-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-0.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3b956fe57856fa753138c2097fca8c3
diff --git a/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0 b/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
index c33650ca1a4e..874ca54c6ff7 100644
--- a/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
+++ b/metadata/md5-cache/dev-ruby/rb-readline-r7-0.5.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rb-readline-r7-0.5.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=096694e9a9fdd90ff33c0a14d8f64482
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.18.6-r1 b/metadata/md5-cache/dev-ruby/rbpdf-1.18.6-r1
index 42eb0d1ec261..644796d83437 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.18.6-r1
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.18.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( || ( dev-ruby/actionpack:3.2[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-1.18.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a4073678f1ad7b7476874e3e34150e7
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.18.7 b/metadata/md5-cache/dev-ruby/rbpdf-1.18.7
index e8feb5d368c2..a6e082a38ab0 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.18.7
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.18.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/htmlentities-4.3.1[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-1.18.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea57cfc973bb54ff79158233996518b2
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.0 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
index 2ff92387b93b..f7829da68b4f 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/actionview:*[ruby_targets_ruby20] dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-1.19.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b76c491b24dba6bc80702a8998e73f76
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0 b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0
index d160d223609f..22d0cf939ca8 100644
--- a/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0
+++ b/metadata/md5-cache/dev-ruby/rbpdf-font-1.19.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rbpdf-font-1.19.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cce09a5ad9994d0cf10bd6c5d364ac9d
diff --git a/metadata/md5-cache/dev-ruby/rbtree-0.4.2 b/metadata/md5-cache/dev-ruby/rbtree-0.4.2
index 3ca4e6ecc93f..8cdcd2bec651 100644
--- a/metadata/md5-cache/dev-ruby/rbtree-0.4.2
+++ b/metadata/md5-cache/dev-ruby/rbtree-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rbtree-0.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9457ddc59ce55cc6948dd0d547580ec7
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.14.1 b/metadata/md5-cache/dev-ruby/rcairo-1.14.1
index 1bc4e16e77a2..59c6ac66a439 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.14.1
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.14.1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.14.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7112f9e24ee3330ba8e0edf280071770
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.14.1-r1 b/metadata/md5-cache/dev-ruby/rcairo-1.14.1-r1
index b8541c4af2dc..b1ddf3e7c3a9 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.14.1-r1
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.14.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.14.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4bff8798be32590bd28c2ea9612075cb
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.14.3 b/metadata/md5-cache/dev-ruby/rcairo-1.14.3
index 33810b9afb55..c6cc16439174 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.14.3
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.14.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cairo-1.14.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4bff8798be32590bd28c2ea9612075cb
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 993de42e7f04..ea3f39c9de0a 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2
+++ b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-1.6.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e3c61c6c07a139b7154bff756af882dd
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 5706de6471b4..e588e55c5c13 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3
+++ b/metadata/md5-cache/dev-ruby/rdiscount-1.6.8-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-1.6.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=30c12c52820f1920c12802252a18e79b
diff --git a/metadata/md5-cache/dev-ruby/rdiscount-2.1.8 b/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
index 45722e445ef9..282f823e8a8a 100644
--- a/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
+++ b/metadata/md5-cache/dev-ruby/rdiscount-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdiscount-2.1.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c0e5cb14f7f3e4f1454aef828c3d3eb
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2 b/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2
index 13640cdfcc35..b877a1d1a16b 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.0.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/json-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a9bc9c2f7d9b92b575367a5f66f900e3
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.2.0 b/metadata/md5-cache/dev-ruby/rdoc-4.2.0
index a5e36c56f7aa..7fe5ecb1dc6d 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.2.0
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/json-1*[ruby_targets_ruby20] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdcd487e2bb60b670ee39a57c4f77379
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.2.1 b/metadata/md5-cache/dev-ruby/rdoc-4.2.1
index a24c33353d2d..e52eefb61d2a 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.2.1
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/json-1*[ruby_targets_ruby20] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3a7823ddd2b0c744595134b4c3a9633
diff --git a/metadata/md5-cache/dev-ruby/rdoc-4.2.2 b/metadata/md5-cache/dev-ruby/rdoc-4.2.2
index 880deaf83029..402cb9813888 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-4.2.2
+++ b/metadata/md5-cache/dev-ruby/rdoc-4.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/json-1*[ruby_targets_ruby20] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-4.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8bb89f1cec5dce3c75fdeb1543ebec7
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
index af3e750f7462..8e69be3efff2 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r1
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdtool-0.6.38.gem
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9b999672cc9c532d7fc6f36cf327362
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
index 927588c07652..6e7700f98620 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( virtual/emacs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rdtool-0.6.38.gem
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8766ed1caa9b0c498d8d5a497d01252a
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 719c8c7a3606..8bb094df71bf 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
+++ b/metadata/md5-cache/dev-ruby/recog-2.0.14-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] !<dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ebfb24e16be89d155faa2e84e1330194
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 e9f8572731a5..87bdb28011c7 100644
--- a/metadata/md5-cache/dev-ruby/recog-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/recog-2.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] !=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8e0d815d7876434cf366a2157225998
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.2.3 b/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
index 32fa55e9889d..c18067788d6b 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.2.3.tar.gz -> redcarpet-3.2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7391d43af7bc7e829b84cef4d67bc431
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.3.2 b/metadata/md5-cache/dev-ruby/redcarpet-3.3.2
index 7abf8ba59fd2..ddb2dab07601 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.3.2
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.3.2.tar.gz -> redcarpet-3.3.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5fdbec4cf17fe13ac0082dcbb4e6c5ac
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.3.3 b/metadata/md5-cache/dev-ruby/redcarpet-3.3.3
index 72016e07f4ef..3c7c291cc6f1 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.3.3
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.3.3.tar.gz -> redcarpet-3.3.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8425757d6e6805b184d9cdf3b089af8d
diff --git a/metadata/md5-cache/dev-ruby/redcarpet-3.3.4 b/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
index c313b211a397..b1ef0aa6019c 100644
--- a/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
+++ b/metadata/md5-cache/dev-ruby/redcarpet-3.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/vmg/redcarpet/archive/v3.3.4.tar.gz -> redcarpet-3.3.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8425757d6e6805b184d9cdf3b089af8d
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3
index b12478f8bbaa..94f2a80ed6f7 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ad30bdee1c4adbc66a81e7f66e84754
diff --git a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4 b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
index 2f22f1939cf6..dca8184a85be 100644
--- a/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
+++ b/metadata/md5-cache/dev-ruby/redcloth-4.2.9-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/jgarber/redcloth/tarball/v4.2.9 -> RedCloth-git-4.2.9.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0200d9c05405d81650889de0586e614
diff --git a/metadata/md5-cache/dev-ruby/redis-3.0.6 b/metadata/md5-cache/dev-ruby/redis-3.0.6
index e5ab03a20a56..0b59a970f5f1 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.0.6
+++ b/metadata/md5-cache/dev-ruby/redis-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.0.6.tar.gz -> redis-rb-3.0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4e9e6bad9f53ea387032581252c61f4
diff --git a/metadata/md5-cache/dev-ruby/redis-3.0.7 b/metadata/md5-cache/dev-ruby/redis-3.0.7
index 52f4ce8a15f9..2439925dd1a9 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.0.7
+++ b/metadata/md5-cache/dev-ruby/redis-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.0.7.tar.gz -> redis-rb-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c6ca5aecdc892fc50a78fcb57ebfaaee
diff --git a/metadata/md5-cache/dev-ruby/redis-3.2.1 b/metadata/md5-cache/dev-ruby/redis-3.2.1
index 1255f3bdbeed..179abd3d442e 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.2.1
+++ b/metadata/md5-cache/dev-ruby/redis-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.2.1.tar.gz -> redis-rb-3.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c87ee273def41bd809373f026f2e826e
diff --git a/metadata/md5-cache/dev-ruby/redis-3.2.2 b/metadata/md5-cache/dev-ruby/redis-3.2.2
index 2d20d5129e15..93f76fb53a23 100644
--- a/metadata/md5-cache/dev-ruby/redis-3.2.2
+++ b/metadata/md5-cache/dev-ruby/redis-3.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/redis/redis-rb/archive/v3.2.2.tar.gz -> redis-rb-3.2.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c87ee273def41bd809373f026f2e826e
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.3.1 b/metadata/md5-cache/dev-ruby/regexp_parser-0.3.1
index eaefd62884f2..a560cf133700 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.3.1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/regexp_parser-0.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=12914fa59d3d1915f010156b9e749d4a
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.3.2 b/metadata/md5-cache/dev-ruby/regexp_parser-0.3.2
index 215c70c9d28c..9d74e620f1f2 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.3.2
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/regexp_parser-0.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8be2bafa5f4ec70019aebc8d8165feb1
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.0.5 b/metadata/md5-cache/dev-ruby/request_store-1.0.5
index 24eea5bca534..9b0a5218c6a5 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.0.5
+++ b/metadata/md5-cache/dev-ruby/request_store-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.0.5
 SRC_URI=mirror://rubygems/request_store-1.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd59a46b2152219c5972d50249f429a3
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.2.0 b/metadata/md5-cache/dev-ruby/request_store-1.2.0
index 6cb741b4f73e..5def22f16aac 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.2.0
+++ b/metadata/md5-cache/dev-ruby/request_store-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/request_store-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42d702dfd185571b74e99a96837e007c
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.2.1 b/metadata/md5-cache/dev-ruby/request_store-1.2.1
index ce61de8e95f0..628147071517 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.2.1
+++ b/metadata/md5-cache/dev-ruby/request_store-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/request_store-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4afb478acbff56a9f885e793f0f3d74
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.3.0 b/metadata/md5-cache/dev-ruby/request_store-1.3.0
index 3ebcbc22a8c6..ee8c4878e26d 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.3.0
+++ b/metadata/md5-cache/dev-ruby/request_store-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/request_store-1.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3240456532d89a9bf3ea46cc3c053e0
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 bd7a63703b7a..6c89df48f589 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b4768fa5e9e110d540a7e2d9d650a04
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 14391aa4fb87..cb0e67833577 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
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e032fd2f07eaab81f60af1dd9edec7ba
diff --git a/metadata/md5-cache/dev-ruby/rev-0.3.2-r1 b/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
index ede9b4945ccf..cf7141b77d18 100644
--- a/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rev-0.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/iobuffer-0.1.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rev-0.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6679765344ff49cbeb01fad34dbeeb3d
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
index 0be5beba3396..f5a92ae5c8c6 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r3
@@ -10,5 +10,5 @@ RDEPEND=!!app-admin/rex ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/rexical-1.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e982729edbc55a7bda8892d1f80318e3
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.6.6 b/metadata/md5-cache/dev-ruby/rgen-0.6.6
index 60aa4e3d60c0..e89d7d0d550c 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.6.6
+++ b/metadata/md5-cache/dev-ruby/rgen-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.6.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=591634d5283e108c1b35729b9a164212
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.7.0 b/metadata/md5-cache/dev-ruby/rgen-0.7.0
index b2e1501adb25..c1a0ae5ed6cc 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rgen-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33057377a04e182ee821f544dcdeb34f
diff --git a/metadata/md5-cache/dev-ruby/rgen-0.8.0 b/metadata/md5-cache/dev-ruby/rgen-0.8.0
index d641ff6f7ea0..96f055b028fb 100644
--- a/metadata/md5-cache/dev-ruby/rgen-0.8.0
+++ b/metadata/md5-cache/dev-ruby/rgen-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/nokogiri[ruby_targets_ruby20] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rgen-0.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8c7b0df683f36f3490feb222803e8c6
diff --git a/metadata/md5-cache/dev-ruby/riel-1.2.0-r1 b/metadata/md5-cache/dev-ruby/riel-1.2.0-r1
index d2de2ea2af8b..064e2da557ae 100644
--- a/metadata/md5-cache/dev-ruby/riel-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/riel-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby19] dev
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	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 f95455397851..1b34ce2f97e2 100644
--- a/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
+++ b/metadata/md5-cache/dev-ruby/riel-1.2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rainbow-1.1.4[ruby_targets_ruby19] dev
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2e77e5d6ad02393d3a33408e8a0b0dd4
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0 b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
index 58ef504ec69b..4485a31f06c7 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fa95c1dff36ed6cf61deb8403b6a6e48
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1 b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
index eb6520aae0e0..0b625ce99779 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/tarball/v1.3.0 -> right_http_connection-1.3.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=273c8f5324f42d1f9bd600299e626693
diff --git a/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0 b/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
index c0f0ba78233d..6c35d2ac6b5d 100644
--- a/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
+++ b/metadata/md5-cache/dev-ruby/right_http_connection-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rightscale/right_http_connection/archive/v1.5.0.tar.gz -> right_http_connection-1.5.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=647ab5994e8215a864a320bb8e932aab
diff --git a/metadata/md5-cache/dev-ruby/rinku-1.7.3 b/metadata/md5-cache/dev-ruby/rinku-1.7.3
index c4dab7bb07e8..19a797d9c519 100644
--- a/metadata/md5-cache/dev-ruby/rinku-1.7.3
+++ b/metadata/md5-cache/dev-ruby/rinku-1.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rinku-1.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23609dccbf972083261d337c63bcc1ba
diff --git a/metadata/md5-cache/dev-ruby/ritex-1.0.1 b/metadata/md5-cache/dev-ruby/ritex-1.0.1
index 32230855464a..26eca0b9a265 100644
--- a/metadata/md5-cache/dev-ruby/ritex-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ritex-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/racc[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ritex-1.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=10d1025e1e2101739c8e67118aafc60c
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.3 b/metadata/md5-cache/dev-ruby/rjb-1.5.3
index 6d4946224fd0..b04393bfbc32 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.3
+++ b/metadata/md5-cache/dev-ruby/rjb-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre >=dev-java/java-config-2.2.0 ruby_targets_ruby19? ( dev-lang
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ) || ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rjb-1.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a81d445f40164c6bfa0073222ae7a1ad
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.4 b/metadata/md5-cache/dev-ruby/rjb-1.5.4
index 93071cbfb27a..52ec3ecd2b00 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.4
+++ b/metadata/md5-cache/dev-ruby/rjb-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre >=dev-java/java-config-2.2.0 ruby_targets_ruby20? ( dev-lang
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) || ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rjb-1.5.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e924b7df2887ee4a8a0a95b57cdad633
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
index 0c45fc3d3f93..c2e1143c2662 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0ab21e7846c72c68b2e048f6a41e994
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
index a23e322cc492..c4983cc69f7a 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rkelly-remix-0.0.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca75d1efab7b85b4d00661af7a6b9455
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.13.4 b/metadata/md5-cache/dev-ruby/rmagick-2.13.4
index a05091daf0b7..42c3ce0a0d97 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.13.4
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.13.4
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.4.9:=[-hdri] ruby_targets_ruby19? ( dev-lang/r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rmagick-2.13.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0db5065b6096d095fc5f70715790ebc
diff --git a/metadata/md5-cache/dev-ruby/rmagick-2.15.4 b/metadata/md5-cache/dev-ruby/rmagick-2.15.4
index 140358f0ca9c..fa1185fb0e03 100644
--- a/metadata/md5-cache/dev-ruby/rmagick-2.15.4
+++ b/metadata/md5-cache/dev-ruby/rmagick-2.15.4
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/imagemagick-6.4.9:= ruby_targets_ruby20? ( dev-lang/ruby:2.0
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rmagick-2.15.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6abc591d859997aa3a7529aa238e1d18
diff --git a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2 b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
index 476cd610053e..f07e7717e2b7 100644
--- a/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
+++ b/metadata/md5-cache/dev-ruby/robots-0.10.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/robots-0.10.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40b1e53c0c370e9d6ca6b3ad7cf88d5d
diff --git a/metadata/md5-cache/dev-ruby/rouge-1.10.1 b/metadata/md5-cache/dev-ruby/rouge-1.10.1
index fbf933fd99ae..a5088a1690e5 100644
--- a/metadata/md5-cache/dev-ruby/rouge-1.10.1
+++ b/metadata/md5-cache/dev-ruby/rouge-1.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jneen/rouge/archive/v1.10.1.tar.gz -> rouge-1.10.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1169aafed8085ffafc6e72f4bb10c29c
diff --git a/metadata/md5-cache/dev-ruby/rouge-1.9.0 b/metadata/md5-cache/dev-ruby/rouge-1.9.0
index 2fcfdf963f6c..ad9ac0031de9 100644
--- a/metadata/md5-cache/dev-ruby/rouge-1.9.0
+++ b/metadata/md5-cache/dev-ruby/rouge-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jneen/rouge/archive/v1.9.0.tar.gz -> rouge-1.9.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aaed768933b424ac1a49f9e5d82a8aad
diff --git a/metadata/md5-cache/dev-ruby/rouge-1.9.1 b/metadata/md5-cache/dev-ruby/rouge-1.9.1
index 75b611291bbb..d060c5dd7ee2 100644
--- a/metadata/md5-cache/dev-ruby/rouge-1.9.1
+++ b/metadata/md5-cache/dev-ruby/rouge-1.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jneen/rouge/archive/v1.9.1.tar.gz -> rouge-1.9.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aaed768933b424ac1a49f9e5d82a8aad
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.10.1 b/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
index 1edfe2183cdf..1ffd19b99033 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.10.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/chunky_png:0[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rqrcode-0.10.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=86d82306108cd18e755038572d1ea44d
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0 b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
index 5ccf5c6d0782..367f267e439a 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/chunky_png:0[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rqrcode-0.9.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99ad56968bb0bf5b5a7841d91bd48505
diff --git a/metadata/md5-cache/dev-ruby/rr-1.1.2 b/metadata/md5-cache/dev-ruby/rr-1.1.2
index bc0a968a28f2..4b47f29d7b01 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.1.2
+++ b/metadata/md5-cache/dev-ruby/rr-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.1.2.tar.gz -> rr-1.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f019f13553dad09cca0b8b993ff4b72b
diff --git a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1 b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
index b1540c8a902d..85e5b1a8e651 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/rr-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/rr/rr/archive/v1.1.2.tar.gz -> rr-1.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=764e59e60df361794f23c4c1a0037887
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 337d85de263c..39edc88a01a6 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.8
@@ -10,5 +10,5 @@ RDEPEND=net-analyzer/rrdtool[graph] !!<net-analyzer/rrdtool-1.4.8-r1 ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b4cfd87e5e3960dc169998789a2ab67
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 91db559c0037..3e7fdc47112d 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
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.4.8[graph=] ruby_targets_ruby19? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=746fb5df0070168cf07c6bd24318c635
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 2af2b7241c93..46641347efa3 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.4.9
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.4.9[graph=] ruby_targets_ruby19? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a50775549e3327bfeff05a734ff08e59
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 28bcd80934f6..9efb94704ec5 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.3
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.5.3[graph=] ruby_targets_ruby19? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59034da2ae80b38027dc9b3fae3c1b63
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 a51be2b989af..62a8b5b72949 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.4
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.5.4[graph=] ruby_targets_ruby19? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b7c4adf44ab3957ff41eca28219c9e7a
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 f68adf0d8e15..1456db82a7ea 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=~net-analyzer/rrdtool-1.5.5[graph=] ruby_targets_ruby19? ( dev-lang/ruby
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3577aacba862bf7d9c4bdf97670f5a4
diff --git a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1 b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
index b6b291d0044b..d4bb1495053f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!<dev-ruby/rspec-rails-1.3.2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-1.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7a5c9fff57bb0d68595910a69454304e
diff --git a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2 b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
index b49da3ee3831..fe77dbbd27fb 100644
--- a/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
+++ b/metadata/md5-cache/dev-ruby/rspec-1.3.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!<dev-ruby/rspec-rails-1.3.2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-1.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3890f17baa718c09126e97cb4a1be97d
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1
index 25416001ffcf..c06dc6f0bfb4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1
+++ b/metadata/md5-cache/dev-ruby/rspec-2.14.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby19] =
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.14.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=496b6385433bba8f56fff701a516aebc
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1 b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
index 96336c980791..7dc78083a38f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-2.14.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.14*[ruby_targets_ruby19] =
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.14.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b382b34ed88b88edf97adedf8ebcbf53
diff --git a/metadata/md5-cache/dev-ruby/rspec-2.99.0 b/metadata/md5-cache/dev-ruby/rspec-2.99.0
index 552990eaf60e..0b82f26b28a3 100644
--- a/metadata/md5-cache/dev-ruby/rspec-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-2.99.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-2.99*[ruby_targets_ruby19] =
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/rspec-2.99.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8facdb86b00bd5c0622b46b731b850b5
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.2.0 b/metadata/md5-cache/dev-ruby/rspec-3.2.0
index bd051f84f437..f4a6f59dceb1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-3.2*[ruby_targets_ruby19] =d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c708650070b2bb7353992a55a8a89554
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-3.3.0
index 337afd118a68..b703929913cc 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby19] =d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c708650070b2bb7353992a55a8a89554
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-3.4.0
index 688e14a5f89f..075a3023978a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-core-3.4*[ruby_targets_ruby20] =d
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/rspec-3.4.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=754de8508544efabda53ad3bf3d30a96
diff --git a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2 b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
index 10b151c0c12c..db298c54228b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-collection_matchers-1.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90a6f5516dfccce64af9df66b3a9e8cf
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 8991318385bb..df9ff477e100 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
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5ae01b4be5b448312bbc32f02818fb4
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 7e778ab1cf18..1cd3ce85cdff 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
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e9d36c5e6efa1130f48ac6af66fa748
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1 b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
index 3de1c7cd2cdf..764bc12a73f4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-2.99.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-core/archive/v2.99.2.tar.gz -> rspec-core-2.99.2-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18cdeaeed03e62406be5f3b46cd4654f
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.2.3-r1 b/metadata/md5-cache/dev-ruby/rspec-core-3.2.3-r1
index bad3c34055b6..cd4070d1489d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.2.3.tar.gz -> rspec-core-3.2.3-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc851b98f074023911fc73b9f307bad1
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 a713ba329345..89cdccb0c873 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=953bd30bdb89c14af8994ec1d254feb0
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1 b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
index 7475b4a58b41..a728a96299c7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5021dbcfa135db49cc76354f16bd3e00
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.4.2 b/metadata/md5-cache/dev-ruby/rspec-core-3.4.2
index 365c800dbcae..eaa93c945720 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.4.2
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.4.2.tar.gz -> rspec-core-3.4.2-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0589a1e833f97268a41c1accb498623
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.4.3 b/metadata/md5-cache/dev-ruby/rspec-core-3.4.3
index 7c20d05c23ab..0ee9d4b25711 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.4.3
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.4.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-core/archive/v3.4.3.tar.gz -> rspec-core-3.4.3-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0589a1e833f97268a41c1accb498623
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5
index 1280d819cdbf..8e5e18bd16c9 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04f7c57a9a61ac0eed837dbbb0e303d0
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
index 390a2703589c..b20ba79fa9a4 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.14.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.14.5.tar.gz -> rspec-expectations-2.14.5-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=050d7e79781289d199cdbbddc271f622
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
index 378a46e20654..11181fdade54 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-2.99.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.1.3[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v2.99.2.tar.gz -> rspec-expectations-2.99.2-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7526f8191c3d0d90ffb6794147cfff78
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.1
index 6879b763d45e..c85c3d814573 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby19] <d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.2.1.tar.gz -> rspec-expectations-3.2.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ca78c7a0e917e16bd87e5d8f895dd0b
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.0
index 12154a27bf23..0786585e617f 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby19] <d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.3.0.tar.gz -> rspec-expectations-3.3.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7f1b50fc678e572d5112d56a1e70acb
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
index 191c7f15b952..5c5a6cb5f997 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby19] <d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.3.1.tar.gz -> rspec-expectations-3.3.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7f1b50fc678e572d5112d56a1e70acb
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.4.0
index 11a2c7de6ade..bc54d720a145 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby20] <d
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.4.0.tar.gz -> rspec-expectations-3.4.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5046b609c57eee65af8045a3e07c0331
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.1.0 b/metadata/md5-cache/dev-ruby/rspec-its-1.1.0
index 1bee3ac9024e..dd06f2cff006 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.1.0
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-its-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec1d7e3c3ec325cc619ab91b35324928
diff --git a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0 b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0
index 5d5c4f394522..be035f4174a5 100644
--- a/metadata/md5-cache/dev-ruby/rspec-its-1.2.0
+++ b/metadata/md5-cache/dev-ruby/rspec-its-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-core-3.0.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-its-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=199846d75fd80dfcbb6eefa91b3d1de1
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
index 70d1beb2ba2f..18f467ad2607 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=005f347ec5fa1011b8c4217e86e8b6d2
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
index 8a783be77ba3..518de425c6f7 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.14.6.tar.gz -> rspec-mocks-2.14.6-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f25f44d3b4fb698a77a00173662fe22
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
index 5ec2137b94ec..2334a846d238 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-2.99.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v2.99.2.tar.gz -> rspec-mocks-2.99.2-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93dc7576a0ca495764fbbd07d2f759bd
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.1
index 9a6536cd1c3c..cdfb4710709b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.2*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.2.1.tar.gz -> rspec-mocks-3.2.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5d96a2604ff8c37909019c477f675ce
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.1
index d126c72af5f2..15815183c39a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.3.1.tar.gz -> rspec-mocks-3.3.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b43c06660ae16e083bbc45e4d166dbf1
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
index 7dcbab205925..91f46a282eec 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.3.2.tar.gz -> rspec-mocks-3.3.2-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b43c06660ae16e083bbc45e4d166dbf1
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.0
index 781ac2f0d6e9..f826a40d14a0 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.4.0.tar.gz -> rspec-mocks-3.4.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a16fde6a5bae6a75c3dc815f2d98f501
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.1
index 203f57e87303..d6b91350bad6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.1
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.4*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.4.1.tar.gz -> rspec-mocks-3.4.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7faba0b7adb2b2180b20679a78187e86
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 0c85ca834c04..8938d94baa84 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.14.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1abcd0b1c35b0b807913239dd8a98fe9
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 99ca26360df2..41e0459645d9 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-2.99.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29c494bd603a7425a8f0aeb57cc49494
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.2.3 b/metadata/md5-cache/dev-ruby/rspec-rails-3.2.3
index 72f9f895908c..240cd33ada5b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.2.3
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.2.3.tar.gz -> rspec-rails-3.2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f9a010f3d684b1e7a1b1ad54fb29f15
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.2 b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.2
index a20fb5219fbb..a01c6b3bc937 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.3.2.tar.gz -> rspec-rails-3.3.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=387603a4304d93b5b45d639f47fe8055
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 b53d48481352..f1f0fd4bdf2d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=387603a4304d93b5b45d639f47fe8055
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-rails-3.4.0
index 472de9f91082..a841f6b929b9 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.4.0.tar.gz -> rspec-rails-3.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41d140bb3a46b8c2670ee6d7b9c96a16
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.4.2 b/metadata/md5-cache/dev-ruby/rspec-rails-3.4.2
index 0bad4206ff8d..b97479e15d8b 100644
--- a/metadata/md5-cache/dev-ruby/rspec-rails-3.4.2
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.4.2.tar.gz -> rspec-rails-3.4.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba4eb22ac0fd4742ad850ac2d945f3f8
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.4.5 b/metadata/md5-cache/dev-ruby/rspec-retry-0.4.5
index e8c0ed434e76..2bf96338e1c1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-retry-0.4.5
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.4.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspec-retry-0.4.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7ef58e36824b7218fb0f069d0b6781a
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.2.1 b/metadata/md5-cache/dev-ruby/rspec-support-3.2.1
index 7da43c79e2e8..16d8f9c938a8 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.2.1
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.2.1.tar.gz -> rspec-support-3.2.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9852b15c8c7859d07bdd1e7fae9e24a
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
index e16040db5b11..6f254e7917f6 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.3.0.tar.gz -> rspec-support-3.3.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f73de50ad69ee2d0af2c0fd316644979
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.4.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.4.0
index 568b89da5698..8d08ec8757eb 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.4.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.4.0.tar.gz -> rspec-support-3.4.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=901de0abe733907b103bc7b5fded7e74
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.4.1 b/metadata/md5-cache/dev-ruby/rspec-support-3.4.1
index 25102da87376..c0753f38fe5d 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.4.1
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rspec/rspec-support/archive/v3.4.1.tar.gz -> rspec-support-3.4.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3aee9db7f78e6be153aef825d00ff9e
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.64.0 b/metadata/md5-cache/dev-ruby/rspectacular-0.64.0
index 59e3bfcc260e..183a48de55a7 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.64.0
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.64.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby19] dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspectacular-0.64.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=717d7e0efc20f2f24f8720aa32e87380
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.68.0 b/metadata/md5-cache/dev-ruby/rspectacular-0.68.0
index 13b85589b0c1..59229ad9586b 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.68.0
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.68.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby19] dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspectacular-0.68.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=717d7e0efc20f2f24f8720aa32e87380
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.0 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
index dc7237f93f5b..2240bf07ced0 100644
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
+++ b/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby20] dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rspectacular-0.70.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dde838ef7c4902688f574b546ed5a598
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3
index 7e8d7825a71c..cb127550dcb1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d207acc8bf6ca80bd071340b8a4aab85
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3-r1
index 263a4574112d..cda1e516dd91 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ade416b074437978ce91cfaff27a0edd
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.5
index ec4ff2af65d6..159b555a6d51 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=393cf568b0f121da06610e791df2e2f5
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-atk-3.0.7
index 67afaa26b5aa..3243ab00bb3a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/atk ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-3.0.7[ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0956c58c07305894213862c6ca964db5
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r2 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r2
index 7b5408aa3a20..6753fe39a4dc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/augeas-1.1.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=468b5fc4addfe49f5ac1b794e2d7be27
diff --git a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3 b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
index 86fa66e641c9..6efba88741a6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-augeas-0.5.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=app-admin/augeas-1.1.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://download.augeas.net/ruby/ruby-augeas-0.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a51ce66a0111cf36eefc22a4b57c6e1e
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.93.2 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.93.2
index b9336e6e214d..cfe8b3c74504 100644
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.93.2
+++ b/metadata/md5-cache/dev-ruby/ruby-beautify-0.93.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-beautify-0.93.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4358f3023c37ae283f601701bdceeeb5
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.3 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.3
index 13a484500a5c..24351259ac19 100644
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.3
+++ b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-beautify-0.97.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54f21efa392b09c6c2b29a35b5819c43
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
index afa6fc97ac1d..d0ad3cb2e263 100644
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
+++ b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-beautify-0.97.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89fa7cdee0673db1ef1748f30d8a1755
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3
index df45e9a0dec3..f8e1e947835f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=adc0ef9680b0f45ac371dd99dd23ab80
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3-r1
index f778493955ba..6bd976c673a0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fee13895a57c42c1a7c8ed354c61215
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.5
index 97eb82f9ddad..5ae8538f909e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=21a5c1f7e1f5185f0f8b298c474a9ebb
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.7
index e3c2d41760ec..cb5f4c016c61 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo ruby_targets_ruby20? ( dev-ruby/rcairo[ruby_targets_ruby2
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f12912ea4ebfbd120797ddda5dc5fb9
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3
index 6fa25bb42f8e..9f2a09c49b97 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e39968f1cc50d0da905377855c694825
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3-r1
index 4d964790f0e8..a4e6c4158b6a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7191a428d6d71f0ce4a11dcf3800ea06
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.5
index cf7b2025fadb..7c132513726a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter ruby_targets_ruby19? ( >=dev-ruby/ruby-cairo-gobject-
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=ce56d803f740ecd3dfabc16d485472c2
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.7
index cff12bf0ffc1..eb273a200927 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter ruby_targets_ruby20? ( >=dev-ruby/ruby-cairo-gobject-
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=22b14c491f407b1502e2656ade37d4c0
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3
index 7fa9fd238d5c..9ee3e300a84a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ad645cd92e9a591e4101f87b6c414c6
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3-r1
index cbf4e4e17775..4945f3058f4f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cdd3304c84c29e22f3f730023b161df8
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.5
index f60a200643b9..068d380cf697 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=5a7b491e1e235753ee5bb9b81df3408c
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.7
index 735eae533036..292b3343366c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby20? ( >=dev-ruby/ruby-clutter-
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=d6e1161675900d74252ae1edfbc37f51
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3
index 7635e76f1d36..4c509f8d5482 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1027e3cb16e69a5300e4870c92242b22
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3-r1
index 140a641c58ef..56a72a9a704d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c250c44d1a1898e6c8459635fce59b5d
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.5
index 11f8127ec40f..d2c1dd538ad8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby19? ( >=dev-ruby/ruby-clutter-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=d8c25650bac7730f0f1d696026d7f2f7
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.7
index 0cf986a5f0e4..6f0f48e35bd4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=media-libs/clutter-gtk ruby_targets_ruby20? ( >=dev-ruby/ruby-clutter-3.
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=2e7bb32450b51ffd0ba694f9ed7a402f
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3
index 0862a4acb0e7..a55d58853b63 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d9908475bab7ad361eb8801c4108c87
diff --git a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4 b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
index f4bca4b9d192..673b98f720e8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
+++ b/metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://www.caliban.org/files/ruby/ruby-dict-0.9.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f7ec4a113bade0d52f524014e0db1ff1
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8 b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
index 9e60a9ac6a62..9ba85ab50357 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=virtual/man ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb9042c356b3393da0652aeff3b85185
diff --git a/metadata/md5-cache/dev-ruby/ruby-elf-9999 b/metadata/md5-cache/dev-ruby/ruby-elf-9999
index 4ca2cd56bbcd..2d192d868c94 100644
--- a/metadata/md5-cache/dev-ruby/ruby-elf-9999
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/man 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
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c32c717c1cc2f40cb76ae2d32e41a6d4
diff --git a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3 b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
index 776b658e797a..e44f0c481afc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
+++ b/metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/magic[ruby_targets_ruby19] ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/feed2imap/ruby-feedparser/archive/ruby_feedparser_0.9.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3270531beb4631ef9e0d7f576506c28b
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.0 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.0
index 21073541cf4f..1f5c382b96a6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.0
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-filemagic-0.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=372d0717c8947d6abc5d1f3276568073
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
index d79955ea6af4..add773b81b94 100644
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
+++ b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/file ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-filemagic-0.7.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4beb382798b1410355fcc873a1b68106
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3
index b13bf22ae605..f6c70d2f2033 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a100462aae6943e550f9ca55bda886e1
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3-r1
index a12c9bc8f737..edee2b295fa6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec034dbfe372a930697f8724eadc816b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.5
index a6bd6a89adee..6e3f3cee434f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=e2e93da5befff961e50e0895a73d48e9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.7
index 371c5fde1a06..a28f906f4d4c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.7[
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=660f64935209a29a5563aecf20cde993
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
index 6f86ac07692d..6e0a00a9ec8b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=28f4084a15d4279f2452efadeee61835
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3-r1
index 78c2b88eba27..62164ef85283 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=12a1b5a9d42de751f27365bd50530a58
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.5
index c700874557a3..c1e367b7341d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=12a1b5a9d42de751f27365bd50530a58
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.7
index ecb2c00fc8c2..c14749bf5dc4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-3.0.7[ruby_
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b71c72893ab2e947549147dbd6cb94d5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
index 37e8c79868eb..453c67f59433 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e16fd42c96c0f9e4d5fd1c015750043
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
index 5682d956be52..cb8511ceb314 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=976a84acc337d9c19aa8342f5c86d79a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.6 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.6
index 893af2fb2a39..6ed869615a7e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.6
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4af93ac91bc84499ae52cbe3464d266d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.7 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.7
index 4fc32ddc24b0..30eadbb2ac4f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfeab15392466f03106ee22d2456a8d6
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.9 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.9
index 883b053f6b8e..94ee78637c06 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.9
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.1.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby20] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.1.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a16f4e6a041aa19c2c17cbc9925610ba
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.0 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.0
index 2be394003619..04a26fd27756 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby20] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05e7fa82f03632d60fdfebb853ac917a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.1 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.1
index 9a321a1291dd..0765c7f17faf 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby20] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/gettext-3.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05e7fa82f03632d60fdfebb853ac917a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3
index ad8dfef5f2ba..8849f6a9c0e5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96d6270cbf758e7482ee662b55e3be5c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3-r1
index 4be500c50af7..3fbbfe2eb15a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.3[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e83a7e5b06ee8c608cc581f43e000684
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.5
index 8fec0dcc0bb5..29b165f759b1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=403739a8361fc7a04d14b09d91a13259
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.7
index b39ea8ab806a..2d01bb9cc2d8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-3.0.7[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09a4f30c20fdfb63ebaa58f18a114dd1
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 00bb5bc51601..65426d9cc728 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abc5561441975e78378805babb9b0b07
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 238704e2a3c6..f5f53345ad24 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
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49557881a56ac0e8b8791d5982e55ecc
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 bc9d91ede223..d6d60bd63d1c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f0851d7fc780cf83345ceb1573b513b
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.7
index a98a2dcee0c5..245b0f3ce58c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=816f3f8b70abf465a6b89878773f8ab4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3
index d4095dc9b732..f30d4f19c27e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=10754d944dd1cd3be8ef8d9cfff941c5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3-r1
index 472496a1cde3..7704b834454d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk-2.2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk-2.2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby21] >=dev-ruby/ruby-webkit-gtk-2.2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-vte-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-webkit-gtk2-2.2.3[ruby_targets_ruby22] >=dev-ruby/ruby-webkit-gtk-2.2.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 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65d9862258a896d9cd679b113e0a535e
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.5
index 75f0c47c2947..c25b0c49364e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-2.2.5
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gstreamer-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-clutter-gtk-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gstreamer-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gtksourceview3-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-poppler-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-rsvg-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-vte-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-vte3-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-webkit-gtk-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gstreamer-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gtk-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gstreamer-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview3-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-poppler-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-rsvg-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-vte-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-vte3-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-vte-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-webkit-gtk2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-webkit-gtk-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-vte-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-webkit-gtk2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-webkit-gtk-2.2.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 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65d9862258a896d9cd679b113e0a535e
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.7
index ac8743ea3198..878f13e19f70 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.0.7
@@ -9,5 +9,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gstreamer-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-clutter-gtk-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gdkpixbuf2-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gdk3-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gio2-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gstreamer-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gtk3-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-gtksourceview3-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-pango-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-poppler-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-rsvg-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-vte-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-vte3-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk2-3.0.7[ruby_targets_ruby20] >=dev-ruby/ruby-webkit-gtk-3.0.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-atk-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gstreamer-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-clutter-gtk-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gdkpixbuf2-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gdk3-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gio2-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gstreamer-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gtk3-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-gtksourceview3-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-pango-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-poppler-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-rsvg-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-vte-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-vte3-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-webkit-gtk2-3.0.7[ruby_targets_ruby21] >=dev-ruby/ruby-webkit-gtk-3.0.7[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-atk-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gstreamer-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-clutter-gtk-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gdkpixbuf2-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gdk3-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gio2-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gstreamer-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gtk2-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gtk3-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-gtksourceview3-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-pango-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-poppler-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-rsvg-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-vte-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-vte3-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-webkit-gtk2-3.0.7[ruby_targets_ruby22] >=dev-ruby/ruby-webkit-gtk-3.0.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 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=826aebaa860bb05ad0b4cdedfcf8fec7
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3
index ce620a1b015f..e64acddd94de 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( >=dev-ruby/ruby-gl
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a9725d611617a4a0c9e44e312cb6722e
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3-r1
index 68d06e88c33c..66a2a1fd7e61 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( >=dev-ruby/ruby-gl
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42baa49a7da09e6b9e2e346122f5a74c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.5
index 155d86796d2e..ce2246f811b8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( ~dev-ruby/ruby-gli
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15b1e5da8ba3c5cc4fd837fe6b6d3cf4
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.7
index bfa1e121bd43..637051c5d4d7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby20? ( ~dev-ruby/ruby-gli
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf8d8ef3de6fd9b824d05e8c0e03ceb8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3
index a95787955a28..50d587ba9e55 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f4b2c9556343f377fd92b7ce37340a3
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3-r1
index f23036a7b8ac..83a3efe6c2d8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8670b55e27b8399bb2b5acda41462728
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4
index cdcac8645ee3..087b392a01a9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=948de9728b3a720ffc95e87ea553e315
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.5
index efeb914922d4..6e6601150142 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=844cc613d75a471e0f2d98db0583943c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.7
index fd5def77c11e..e2d883d13cb5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=4121b21ce93a0e1e553127f6de7c071b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3
index 7adefc450c81..3c7c279071b4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b0d1f161233787fd8256a3363259a9a9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3-r1
index 50d703b1fc6f..dbc763c83894 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f910b9c884d6669857db2f1d2e64771
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.5
index 5f7a27cb1f34..f2f0907aa676 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=d48b6590464f0c9f5d99e9838724f3f8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.7
index f925c967cdfe..f491311f2f46 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-3.0.7[
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=bdf7d098020db05501cb70c01606da2c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
index e8354859ace1..8b5cd9b149f1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=83becbbb05ff443aea17397b52c90a11
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3-r1
index def2280268ca..b911e38549e4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.3[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a8f3e6455a8b80f523b2e49c5a185dbb
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.5
index 777dd1795c99..5bf276b8677b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=f75ee977aa40247b30b3833161e4a1ff
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.7-r1 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.7-r1
index 4ae99ad5a0b4..77cbd53f0cbd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-atk-3.0.7[ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=765eb52f083f4d678b8e8b0caa47f25c
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3
index a4fceae703d3..721bf2f0de88 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79df02b30773cc480808f09862c58ed2
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3-r1
index b6d4e2fefc92..60545d6cf666 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9d996164bd277420067b3437ea2265d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.5
index 9d339592f33d..d19d16e58759 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=f4d806d21dc732395783091ccedff302
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.7
index 4fdcad70ec84..bd55b2e932a4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk2-3
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=252e88849bc54bacd1697c522105e02b
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3
index b729da82b723..7c55ff0c7f4f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=547a97b51e1ed97ee42cd17ff21cb0dd
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3-r1
index b4b15ada2c0c..48359818dd2d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35a588cdc0fcabc594ddb07cfb804595
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.5
index b3f0d53292f6..93057851908d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=836789db1c5790105ada6200fad9bf89
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.7
index fb7bf122cadb..64b657e49e6e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-3
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=01456c98d288aa69c6ca1a6fccce0261
diff --git a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1 b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
index 301d4418763d..83f543a43631 100644
--- a/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-hmac-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-hmac-0.4.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68f80b6b2f3101d4d51395b096ee437c
diff --git a/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2 b/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
index 5ee8919023dd..5c881e904991 100644
--- a/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-inifile-2.0.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://gregoire.lejeune.free.fr/ruby-inifile_2.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=39047ca9544fc9ee104718507f28acfd
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r1 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r1
index 33ce0d7b050a..ef7e98706bc8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.16-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.16.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02c95a771e3f3d521928b3b851c71e7c
diff --git a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17 b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
index 7188f1a109d3..0537a859ffa0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
+++ b/metadata/md5-cache/dev-ruby/ruby-ldap-0.9.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ldap-0.9.17.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=871ae249d773f5ef9bc4f124b53c40c0
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.8 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.8
index 3ce56f2ce728..e2d86249d93f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.8
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.8.tar.gz -> ruby-mp3info-0.8.8-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42b3e83296569ebe70fb78103be1fd23
diff --git a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9 b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
index 46e301537d79..9477ace07022 100644
--- a/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
+++ b/metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/moumar/ruby-mp3info/archive/v0.8.9.tar.gz -> ruby-mp3info-0.8.9-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42b3e83296569ebe70fb78103be1fd23
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.12.1 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.12.1
index 24f09685b553..6686f0816cd1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.12.1
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.12.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.12.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b1d6ba2cde88ad04c6320dbdc7f47c2
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.13.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.13.0
index d14085cbfd09..8e12b69f2550 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.13.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.13.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cb5cae8c781f9a8848995b7ebc087779
diff --git a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.14.0 b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.14.0
index e73cd9f2f68a..0e4c672658da 100644
--- a/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.14.0
+++ b/metadata/md5-cache/dev-ruby/ruby-net-ldap-0.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/net-ldap-0.14.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cb5cae8c781f9a8848995b7ebc087779
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
index 8ed0c1172659..d8ec5cf3fa1c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=efbafed1f79e29d70d770cad595ac79f
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
index 6adba053894f..f959d165f6f3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=67ae6660013b4d057332ec882be3fd53
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
index e92eef6fba07..9453cc8a5e3d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.1.8
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.1.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8cfa4e8c6aa38d5ef8a90117ab68bdf6
diff --git a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1 b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1
index 50f87d3ac9ff..1116160333a7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1
+++ b/metadata/md5-cache/dev-ruby/ruby-oci8-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/oracle-instantclient-basic ruby_targets_ruby19? ( dev-lang/ruby:1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oci8-2.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=01bc9c64263e52145fbb00b8d783998c
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997
index af92c8c68e5d..800f0dd17e1e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99997.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc12431fbc4ea621a46f22fd5cd0ff90
diff --git a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1 b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
index 4f04f80c6278..db536c318ebc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-odbc-0.99997-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.ch-werner.de/rubyodbc/ruby-odbc-0.99997.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=252649917c215cbce9a06549a614e232
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.8.14 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.8.14
index 5605ea803b40..b0fdd4af6f7b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.8.14
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.8.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oembed-0.8.14.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eac4892016ed46fb9d468a05489f7d10
diff --git a/metadata/md5-cache/dev-ruby/ruby-oembed-0.9.0 b/metadata/md5-cache/dev-ruby/ruby-oembed-0.9.0
index 324c7434a68b..2d98082754fb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-oembed-0.9.0
+++ b/metadata/md5-cache/dev-ruby/ruby-oembed-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-oembed-0.9.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7a8b81ee7c7f01db04449cc772de674f
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.11.8 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.11.8
index abc39ea587e0..9ab25a6b5d92 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.11.8
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.11.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ole-1.2.11.8.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b893f16233d1b43b5f1efc714a862f5b
diff --git a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12 b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12
index 94ff995c6ceb..8673624a9a13 100644
--- a/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12
+++ b/metadata/md5-cache/dev-ruby/ruby-ole-1.2.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-ole-1.2.12.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=544f1313a52cc2a8b932a86f20456952
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
index 64a6e62f5624..764d6621d318 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby19? ( dev-lang/ruby:
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=501d586916147aee703febf478828334
diff --git a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2 b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
index 4c6f01cc362f..bf9318cc5bf5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
+++ b/metadata/md5-cache/dev-ruby/ruby-opengl-0.9.2
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl media-libs/freeglut ruby_targets_ruby19? ( dev-lang/ruby:
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/opengl-0.9.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe674744df899dc2ecde530470932568
diff --git a/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0 b/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
index 6ec49d2e34fc..e65109488c05 100644
--- a/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
+++ b/metadata/md5-cache/dev-ruby/ruby-openid-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/openid/ruby-openid/archive/v2.7.0.tar.gz -> ruby-openid-2.7.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=477c74f17dc7df77d32c287b7d20ecfa
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3
index d7269ab330ea..34f6334edff9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a54cbab0cc549ff55bfd594c71ad62fa
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3-r1
index 25e8dd11c1d5..12b81fbdca86 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f633d28fd485819e66e622e7bb1a0135
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.5
index f9c065af1418..54befcd4c486 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2ceab7b3d0eb9e0723ce85763259b77f
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-pango-3.0.7
index dc4d08b28c8f..4e89d9442534 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-3.0.
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b83b152132f7f2fff2fb7e20551185d
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3
index 171b6d0e41aa..1ae12c268061 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f5c312bb304e647c1e2968f485456ef
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3-r1
index f0dea1bacfe7..c680ff0adf11 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76b055c678657f755eb7203c383baa23
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.5
index f2b8bea3fc92..13ed273b3479 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby19? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f86519350d0fda120f3c8507a894b929
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7
index 7717dc294c4b..3d2e9a5aeb1e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby20? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09ac1e8321c388ca207bfd1eb7966078
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7-r1 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7-r1
index 2843e86102cd..9d6f8ed69728 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[cairo] ruby_targets_ruby20? ( dev-ruby/ruby-gdkpixbuf2[
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc5116f3fb7d00a9d0751d50d3f65a32
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.15.8-r1 b/metadata/md5-cache/dev-ruby/ruby-prof-0.15.8-r1
index 2f45d099647a..c08910d965c3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.15.8-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-0.15.8-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/v0.15.8.tar.gz -> ruby-prof-0.15.8.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9246f08df65e6a4a4119961430b33e56
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.15.9 b/metadata/md5-cache/dev-ruby/ruby-prof-0.15.9
index 6875c943a1ec..e8c7bb21e274 100644
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.15.9
+++ b/metadata/md5-cache/dev-ruby/ruby-prof-0.15.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/v0.15.9.tar.gz -> ruby-prof-0.15.9.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4de9c71c984dfb594f91f81cfe4f87da
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2
index f5106b70991e..5eaf9de490eb 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b947fc436502513ad443abd7db08f65
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
index d0e63c390ddf..1a8747c1c5a3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=314faba3ee75449e12ac99a3ef64a787
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
index 1ed755d13200..b941691640f1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-progressbar-1.7.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eabb5c282304f01bc20c14d8c69acee4
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
index f673a3e2e37d..6de18a501a14 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-rc4-0.1.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1bde5b091798b7e7770d7746246d6136
diff --git a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2 b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
index bedddc613b5f..2921f39dfbe3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-rc4-0.1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-rc4-0.1.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fbd0cd473ed15253764b2593b698711a
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r5 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r5
index 4d85c286530a..b39f6c84f9c7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r5
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0800714cff505fe14aa02631a1fa86c
diff --git a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6 b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
index 8f4c3ccefc0e..2c81a7cd49a4 100644
--- a/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
+++ b/metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://0xcc.net/ruby-romkan/ruby-romkan-0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06faa3e01191c8cd191275ac37c3bc42
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3
index f97db3fef736..2a7d24527459 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=afc39b62ede1f6042f68efe988b17a30
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3-r1
index 4b4e6294c00d..4c352babbac8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcb86d95d9d1dbe9d1b5cfe79b63da04
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.5
index a885a40b801c..47f4f78b42e2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbu
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=654354173351b1cdcfe038bc944986a4
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.7
index 7eaa3293107a..34315d5fd4c6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbu
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07753fcc569fb44aeaa6b0d30147e1e5
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r1 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r1
index f21ef99e5f4a..02fe15479d52 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=275904a6532b38129124b3de4a5420d6
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
index 524eaf1d293f..a84775160652 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=805b4aeec2fca201bb23bc2abea03af2
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.4.1 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.4.1
index 051a7bb77961..d99765d99cf0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.4.1
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shadow-2.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=36cc4a1c3a16b855dbfdeea47720d58b
diff --git a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0 b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
index 87c39af5a098..1cc29d454f6c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
+++ b/metadata/md5-cache/dev-ruby/ruby-shadow-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shadow-2.5.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=655ce37784e843e9101fd3edb52f5da1
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
index 4ffb5f9fc0cf..3a49cbabb96b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shout-2.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab08afb34bc3b3676f70305c251d6102
diff --git a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r2 b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r2
index 6ba0b35b0371..f1b3dfb7db7e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-shout-2.2.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.0 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-shout-2.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eda5b4f89c590d6aec26fcd081f5c314
diff --git a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2 b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2
index 031dc1cf5ff8..bb81cdfb1252 100644
--- a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r2
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libident sys-apps/tcp-wrappers ruby_targets_ruby19? ( dev-lang/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://shugo.net/archive/ruby-tcpwrap/ruby-tcpwrap-0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7c51ffb2c98283931c6a4bf5ed95967
diff --git a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3 b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
index ab74f479f750..4b669709794a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-tcpwrap-0.6-r3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libident sys-apps/tcp-wrappers ruby_targets_ruby19? ( dev-lang/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://shugo.net/archive/ruby-tcpwrap/ruby-tcpwrap-0.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=154d8319142936da7a06880d151b3e00
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
index 2929b92f25f2..bd9c80db8d21 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/arika/ruby-termios/archive/version_1_0_0.tar.gz -> ruby-termios-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ece4d410fdac60130a242da030c759a5
diff --git a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1 b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
index 2e76eed505a9..179ea29b8436 100644
--- a/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-termios-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/arika/ruby-termios/archive/version_1_0_0.tar.gz -> ruby-termios-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=00a3cdb099023d213a9dc8f9e9064169
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3
index d0ca0fbc6605..38fa629b9a55 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b17faf1f1959ba59eb6d693849c6984
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3-r1
index 39bac50df961..bd664c0bbee2 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad9c57ee29475d78e41e6bdd0739bde5
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.5
index 497d4e718443..d065fd1227af 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk2-2.2.
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad9c57ee29475d78e41e6bdd0739bde5
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-vte-3.0.7
index 47b7a8c65c81..5b3b7df1c24b 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk2-3.0.
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49f96d2317fa7de99be33c7fbbde86a5
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
index aac279c6e632..4acbafee9c8d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=781d172b15726e0e82bad5c508736aa2
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3-r1
index da11dd5f93ef..46caeee1949c 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.3[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1ff6a60ce34cefe765fb0d6627cda59
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.5
index 2fef7275087c..2fabfef4f1c3 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby19? ( >=dev-ruby/ruby-gtk3-2.2.5[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1ff6a60ce34cefe765fb0d6627cda59
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.7
index 6989527de456..1b8e64989337 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/vte:2.90 ruby_targets_ruby20? ( >=dev-ruby/ruby-gtk3-3.0.7[ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=602942190b616bbe5fc8bdafa71be4b4
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3
index 6a43a7845386..6f848dffa3b8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df1d2e6db59aa371909a2d518cf12d85
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3-r1
index 5610fc3e948e..d95377eb0262 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=973a95128dd8f4510bc46eed81d00133
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.5
index 8a295c87a66b..8683beb1937d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=e806a0f4d246f8d4deea8b0a9f7d9a41
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-3.0.7
index c6e42e027ca9..5dafc75a1b44 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:3 ruby_targets_ruby20? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=72cb748f994de833e62f63e1e0209e46
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3
index c825ad798894..512e6186aef5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=901144c5d01faf26bcfbde00d4594b21
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3-r1 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3-r1
index c8e461476068..6138bb47136e 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4a2690b09f3e55b01f951536c8e9773
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.5
index 683241a6875e..32da977f26dc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.5
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-2.2.5
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=0171852e94ee2320ee9c399c8ef14d93
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-3.0.7
index 29814a1e2af3..495bb1c54838 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit-gtk2-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:2 ruby_targets_ruby20? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=a9fb5b6208a44570bd4a1244f75d06c2
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.7 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.7
index 0743975157c9..0f570bd606ba 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.7
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby20? ( >=dev-ruby/ruby-gobject-int
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.0.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-ng-gnome2	c61bccb936b239bb053e8cd8d3469d69	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=6ca5b4ef6658284779fa40867be05232
diff --git a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3 b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
index 7a3e7e4e8efb..f01d25ca029d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
+++ b/metadata/md5-cache/dev-ruby/ruby-xslt-0.9.9-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxslt-1.1.12 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-xslt-0.9.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4760eef71aa9fc9c3eb74454f748e5e4
diff --git a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2 b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
index 3bc18ddbe8a8..1ae931b049ce 100644
--- a/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby-yadis-0.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=88e331431a8dd19aefe8d6d5736ba672
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
index ebc766bdf3f5..47a0c520d32f 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/sexp_processor:4[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a300b4655cd019ce01119dee193744de
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.2.0 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.2.0
index 9e2fa7de4a01..6d5a2e36ecec 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.2.0
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab312f38c5c357477ae21f9500fd4298
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
index 48c068cf7df7..38ef2481070f 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2689dbf402300fb2f3547cd7da90aa6f
diff --git a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4 b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
index a19894e6775d..990a9f7d1252 100644
--- a/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
+++ b/metadata/md5-cache/dev-ruby/ruby_gntp-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ruby_gntp-0.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=203b184330bdc23e277071c3f2e17954
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6 b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
index 565421366885..a812d995ef62 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.6.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2aabe19d9f979f1db0b0b37f5f933a09
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.7.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.7.2
index fce10ab0c8a3..67a2cebd8ac4 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.7.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.7.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=154d411ceefa7b35086f65b414364de0
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.7.3 b/metadata/md5-cache/dev-ruby/ruby_parser-3.7.3
index 2903563405a9..9b4d44d52afc 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.7.3
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/sexp_processor-4.6.1:4[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=3
 SRC_URI=mirror://rubygems/ruby_parser-3.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84e03abe92bb1a79f31e3ad8d168e4ad
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1 b/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
index 38e1c9cf72a0..baf94b9bcd9b 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.2.5.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56235148f448d738e97909379e3087b2
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.5.1 b/metadata/md5-cache/dev-ruby/rubygems-2.5.1
index f0a659dfdc1f..a0882b243a1e 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.5.1
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.5.1
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.5.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=12bbf474f652329de21317acb8280cd1
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.5.2 b/metadata/md5-cache/dev-ruby/rubygems-2.5.2
index c99d6f391cab..7442d622edb2 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.5.2
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.5.2
@@ -11,5 +11,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://rubygems.org/rubygems/rubygems-2.5.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99c56cc28468ebb0b29d87faabb684c1
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.5.3 b/metadata/md5-cache/dev-ruby/rubyntlm-0.5.3
index a46ebe5c2b0e..6f06b63fc43e 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.5.3
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyntlm-0.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d5e1fd29c0bfce845f8b44d63e6783e
diff --git a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.0 b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.0
index 4d1d57613960..45c5816a1de4 100644
--- a/metadata/md5-cache/dev-ruby/rubyntlm-0.6.0
+++ b/metadata/md5-cache/dev-ruby/rubyntlm-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyntlm-0.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d5e1fd29c0bfce845f8b44d63e6783e
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
index 17369ea1ea60..2cfd15736c5b 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5a1eb31ca9d29d8b1f510cdee4db136
diff --git a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5 b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
index 3073b888a4e3..2c9c3fcdf22d 100644
--- a/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
+++ b/metadata/md5-cache/dev-ruby/rubypants-0.2.0-r5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubypants-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5c04f01407061e0cbd64277b2991e7f
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.7.0 b/metadata/md5-cache/dev-ruby/rubytest-0.7.0
index 23ed548612e2..8ac163a52f7b 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.7.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytest-0.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=959a61011ceb82f42f6985bf970bf198
diff --git a/metadata/md5-cache/dev-ruby/rubytest-0.8.1 b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
index 3c9a70d8cab1..d0e88c7e1a0c 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-0.8.1
+++ b/metadata/md5-cache/dev-ruby/rubytest-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytest-0.8.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af04d74c42d0bc364bfa3ac795ff5332
diff --git a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0 b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
index e2b15abe0ba2..2653ce8b0a3b 100644
--- a/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
+++ b/metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/ansi[ruby_targets_ruby19] >=dev-ruby/rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytest-cli-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a98f1cd5677cbff88d4627df10068c97
diff --git a/metadata/md5-cache/dev-ruby/rubytter-1.5.1 b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
index 23e05db21d03..195861f4184a 100644
--- a/metadata/md5-cache/dev-ruby/rubytter-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rubytter-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/rubytter-1.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f5db5569759877c8bcba495b895e4d7a
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r1 b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r1
index 9ee66afc3eb6..a6e2d272fa00 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/aussiegeek/rubyzip/tarball/0.9.9 -> rubyzip-0.9.9-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c806b99d587726e5d98fc84a844b1fa
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2 b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2
index d6228058dd00..d6fa68370269 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2
+++ b/metadata/md5-cache/dev-ruby/rubyzip-0.9.9-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/aussiegeek/rubyzip/tarball/0.9.9 -> rubyzip-0.9.9-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff478a5bd12fdf7e8810b19435083e7e
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.1.7 b/metadata/md5-cache/dev-ruby/rubyzip-1.1.7
index 72913161d169..0e4d33db8593 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.1.7
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.1.7.tar.gz -> rubyzip-1.1.7-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90055fc65dc86634b265abe6bd157444
diff --git a/metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1 b/metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1
index 239f412ff65c..0eb982237014 100644
--- a/metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1
+++ b/metadata/md5-cache/dev-ruby/rubyzip-1.1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1
 SRC_URI=https://github.com/rubyzip/rubyzip/archive/v1.1.7.tar.gz -> rubyzip-1.1.7-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eacbcd9a04fe832f538bd45535c00d5d
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
index 592ff4bf3d77..ead58df85ad3 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=942e9338a00d7c60e7bed25cf0993c9c
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r1 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r1
index 5e9bc560555c..2ab3e33b9f19 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3425c2575508cd6a34bd72c806cbfeb
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
index 6858a43a409e..f1db98b16430 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=300d826f9f747d51807dcfc1cddc5aed
diff --git a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r1 b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r1
index 23a326d1997d..eb7ccf8009a1 100644
--- a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/samuel-0.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a130da79d16292fb4f4e0710621f3f7
diff --git a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2 b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
index 59bdc7e18928..84a25c857ba4 100644
--- a/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
+++ b/metadata/md5-cache/dev-ruby/samuel-0.3.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/samuel-0.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84fb7b3c13ccd97100a13fcd4d619d95
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 1415fc0c4764..c0b74bdc6ea4 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.0.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/nokogiri[ruby_targets_ruby19] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aae78a8ee2cff81f8018679e37d557f6
diff --git a/metadata/md5-cache/dev-ruby/sanitize-2.1.0 b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
index 96d4ac471cb6..9288629e7e29 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-2.1.0
+++ b/metadata/md5-cache/dev-ruby/sanitize-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff613754310367c4c028e2a3d65c4fcb
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 778bba59092c..3cbe947d91ed 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-4.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby19] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff9b7f6e1999015da259490384211f2b
diff --git a/metadata/md5-cache/dev-ruby/sanitize-4.0.1 b/metadata/md5-cache/dev-ruby/sanitize-4.0.1
index 9d0446ba86de..f6db44995003 100644
--- a/metadata/md5-cache/dev-ruby/sanitize-4.0.1
+++ b/metadata/md5-cache/dev-ruby/sanitize-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/crass-1.0.2[ruby_targets_ruby20] =dev-
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=https://github.com/rgrove/sanitize/archive/v4.0.1.tar.gz -> sanitize-4.0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e3f08807fb5df3d168199138408ff07a
diff --git a/metadata/md5-cache/dev-ruby/sass-3.2.19-r1 b/metadata/md5-cache/dev-ruby/sass-3.2.19-r1
index 1658ed023509..fa9a762b950d 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.2.19-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.2.19-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby19] !!
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sass-3.2.19.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58f67f979e9186150f21c9da018be893
diff --git a/metadata/md5-cache/dev-ruby/sass-3.2.19-r2 b/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
index 85af20ba6007..4146701c1822 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
+++ b/metadata/md5-cache/dev-ruby/sass-3.2.19-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-0.7.2:0[ruby_targets_ruby19] !!
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sass-3.2.19.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7cc55f41588e26304a0a48519eab721d
diff --git a/metadata/md5-cache/dev-ruby/sass-3.3.14 b/metadata/md5-cache/dev-ruby/sass-3.3.14
index 7959f389d294..92f5a6815fe4 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.3.14
+++ b/metadata/md5-cache/dev-ruby/sass-3.3.14
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1[ruby_targets_ruby19] !!<d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.3
 SRC_URI=mirror://rubygems/sass-3.3.14.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad27d5961737c532a4c8eb24b080d563
diff --git a/metadata/md5-cache/dev-ruby/sass-3.3.14-r1 b/metadata/md5-cache/dev-ruby/sass-3.3.14-r1
index dbed71aa89a1..a8c1410fd333 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.3.14-r1
+++ b/metadata/md5-cache/dev-ruby/sass-3.3.14-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1[ruby_targets_ruby19] !!<d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3.3
 SRC_URI=mirror://rubygems/sass-3.3.14.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17b911d48ea48c2b579217c03548a3f6
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.15 b/metadata/md5-cache/dev-ruby/sass-3.4.15
index 680faeb575b2..fa5e7738e8f6 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.15
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.15
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby19] !!
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.15.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ef700789ec46db601f6ab8995566d4c
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.19 b/metadata/md5-cache/dev-ruby/sass-3.4.19
index 2872fb43a53a..b6cf76bcfecd 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.19
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.19
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby19] !!
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.19.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d128a760ec303c0b3af390d2ef15b12a
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.20 b/metadata/md5-cache/dev-ruby/sass-3.4.20
index 824e1734d545..b27a8d0ec331 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.20
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.20
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby20] !!
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.20.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42d306853b549525e9f46be41911092d
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.21 b/metadata/md5-cache/dev-ruby/sass-3.4.21
index 1ac66b7e2aeb..f2e5b5eec66f 100644
--- a/metadata/md5-cache/dev-ruby/sass-3.4.21
+++ b/metadata/md5-cache/dev-ruby/sass-3.4.21
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby20] !!
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3.4
 SRC_URI=mirror://rubygems/sass-3.4.21.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31d06dcca625a72a3f8441455f1ef81f
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-3.2.6 b/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
index 6e5cca24c727..8751eb6105b4 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
+++ b/metadata/md5-cache/dev-ruby/sass-rails-3.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=3.2
 SRC_URI=mirror://rubygems/sass-rails-3.2.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82355deacb0e8e969d7fec3daaa2ee85
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-4.0.5 b/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
index f174146e48d6..b35227962cac 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
+++ b/metadata/md5-cache/dev-ruby/sass-rails-4.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=4.0
 SRC_URI=mirror://rubygems/sass-rails-4.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c03a043d381c0f449ffeed045fb9d3ec
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.3 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.3
index 0ab94d2d5edb..aec528b941a2 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.3
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.3.tar.gz -> sass-rails-5.0.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b7122e7b8c44bbe83fe8a4d9e41433a7
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4
index 58e859b2e969..0ccaa32a7c78 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.4.tar.gz -> sass-rails-5.0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74aee971ed30bd704e68b8fdfb9b8707
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
index 324a24612ee1..99f908701d84 100644
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
+++ b/metadata/md5-cache/dev-ruby/sass-rails-5.0.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=5.0
 SRC_URI=https://github.com/rails/sass-rails/archive/v5.0.4.tar.gz -> sass-rails-5.0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb29ba1d9caf3d085f0bb7de98860640
diff --git a/metadata/md5-cache/dev-ruby/sawyer-0.7.0 b/metadata/md5-cache/dev-ruby/sawyer-0.7.0
index 3bdad8cae9ba..2714c8cd12de 100644
--- a/metadata/md5-cache/dev-ruby/sawyer-0.7.0
+++ b/metadata/md5-cache/dev-ruby/sawyer-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( <dev-ruby/faraday-0.10[ruby_targets_ruby20] <dev-
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sawyer-0.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f89c88615693a39649029a098677fabe
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.3.20 b/metadata/md5-cache/dev-ruby/sdoc-0.3.20
index d9677d0524c9..47396bead8b7 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-0.3.20
+++ b/metadata/md5-cache/dev-ruby/sdoc-0.3.20
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.1.3[ruby_targets_ruby19] >=dev-
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sdoc-0.3.20.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05fb324a216d15c2d11e7b21378a80c7
diff --git a/metadata/md5-cache/dev-ruby/sdoc-0.4.1 b/metadata/md5-cache/dev-ruby/sdoc-0.4.1
index 534b8f35b9fc..757f88ff4634 100644
--- a/metadata/md5-cache/dev-ruby/sdoc-0.4.1
+++ b/metadata/md5-cache/dev-ruby/sdoc-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/json-1.7:0[ruby_targets_ruby19] =dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sdoc-0.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89cc22ab5708828ccd79896995962440
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.2.0 b/metadata/md5-cache/dev-ruby/seed-fu-2.2.0
index f0fce76c03ab..cb3d98ef055c 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.2.0
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.2.0.tar.gz -> seed-fu-2.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e274fceef65c0341850e6cc6941cca21
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.3 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.3
index a17a483cee18..bf8dc43a3609 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.3
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.3.tar.gz -> seed-fu-2.3.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74d25034909ed5fae638de3a52c05bb9
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.4 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.4
index 3aaba648654c..622729406bf7 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.4
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v2.3.4.tar.gz -> seed-fu-2.3.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74d25034909ed5fae638de3a52c05bb9
diff --git a/metadata/md5-cache/dev-ruby/seed-fu-2.3.5 b/metadata/md5-cache/dev-ruby/seed-fu-2.3.5
index 4ac989e5b4c6..6a25c50154cc 100644
--- a/metadata/md5-cache/dev-ruby/seed-fu-2.3.5
+++ b/metadata/md5-cache/dev-ruby/seed-fu-2.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activerecord-3.1[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/mbleigh/seed-fu/archive/v.2.3.5.tar.gz -> seed-fu-2.3.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=917928766cac05ce6f25df92e0d14ad5
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.47.1 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.47.1
index 78d8fa593746..0aa71d07acb3 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.47.1
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.47.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.47.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=057d18205dabfae073fc5ddbc0f6e65b
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.50.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.50.0
index e65faa80e0b6..e0ce6b5853d2 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.50.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.50.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.50.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=deb464e02908711aa16ec2a2f64c9c40
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.51.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.51.0
index 0bf5d4bfad1b..b78fae08026b 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.51.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.51.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.51.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=deb464e02908711aa16ec2a2f64c9c40
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.52.0 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.52.0
index 73843ba1d354..9b307916a56c 100644
--- a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.52.0
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.52.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/selenium-webdriver-2.52.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=deb464e02908711aa16ec2a2f64c9c40
diff --git a/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.1 b/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.1
index 3d3dabd641d1..824ec46c0f39 100644
--- a/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.1
+++ b/metadata/md5-cache/dev-ruby/semantic_puppet-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/semantic_puppet-0.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e37985dcd7168c15da678a0b796bf6f4
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.0 b/metadata/md5-cache/dev-ruby/serialport-1.3.0
index 99d81e0245f2..40e0fe16b979 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.0
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/serialport-1.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56d9cb3d1db493521e97fe37647094f3
diff --git a/metadata/md5-cache/dev-ruby/serialport-1.3.1 b/metadata/md5-cache/dev-ruby/serialport-1.3.1
index 3a5b4a2caea2..4833846e2929 100644
--- a/metadata/md5-cache/dev-ruby/serialport-1.3.1
+++ b/metadata/md5-cache/dev-ruby/serialport-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/serialport-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5061d3825e4957aec8b3a041e2512ca8
diff --git a/metadata/md5-cache/dev-ruby/session-3.1.2 b/metadata/md5-cache/dev-ruby/session-3.1.2
index 065a977edc7e..0ce5fb3c27a9 100644
--- a/metadata/md5-cache/dev-ruby/session-3.1.2
+++ b/metadata/md5-cache/dev-ruby/session-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9ecca0757c985ab4b565365b3ecda0ac
diff --git a/metadata/md5-cache/dev-ruby/session-3.2.0 b/metadata/md5-cache/dev-ruby/session-3.2.0
index 641863b9894f..d3bf46d02088 100644
--- a/metadata/md5-cache/dev-ruby/session-3.2.0
+++ b/metadata/md5-cache/dev-ruby/session-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/session-3.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dda6b1201a34ac71e57a413300ca5875
diff --git a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9 b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
index 4d6d305ccbef..41bd021c8aeb 100644
--- a/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
+++ b/metadata/md5-cache/dev-ruby/settingslogic-2.0.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/settingslogic-2.0.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ce37279ac8094e80daa4dcab952b310
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4 b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
index 9ff87534694b..089d853ae57a 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.4.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e774ad1a787d12c72332cd1fd82bf914
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.6.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.6.0
index d8b5f7176780..e0660630abdc 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.6.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=513f58ae4ce54d79130625a0fef42c45
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.6.1 b/metadata/md5-cache/dev-ruby/sexp_processor-4.6.1
index 8304c7d6a63f..f09630abc43e 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.6.1
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.6.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31a708d3e32254fd39fa03f3c5359d8c
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
index 1506de74ba9f..af669ff748ff 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=4
 SRC_URI=mirror://rubygems/sexp_processor-4.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31a708d3e32254fd39fa03f3c5359d8c
diff --git a/metadata/md5-cache/dev-ruby/sfl-2.2-r1 b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
index 031c996fd0c0..d04a65b03bd8 100644
--- a/metadata/md5-cache/dev-ruby/sfl-2.2-r1
+++ b/metadata/md5-cache/dev-ruby/sfl-2.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sfl-2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32988463c687e60c0bbe5b5de2ac1398
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
index 325bc95c9396..c6317d0d642c 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5228f4d1342909f5d7bd377ebdf80bc
diff --git a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2 b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
index 1a8b8133f936..e04bf15c1070 100644
--- a/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
+++ b/metadata/md5-cache/dev-ruby/shorturl-1.0.0-r2
@@ -1,15 +1,15 @@
 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_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=A very simple library to use URL shortening services such as TinyURL or RubyURL
 EAPI=5
 HOMEPAGE=http://shorturl.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 ruby_targets_ruby23 doc test
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
 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_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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/shorturl-1.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1aa1571d6cc48bb664bf02a94e1c0079
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7eb1e0dee0022fb9428099fafc27de0c
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9-r1 b/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
index afaecca4fd12..a30308d0506d 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/shotgun-0.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54a27f06477d4cace089207663590e52
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.1 b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
index 63b20d039f9b..79d81eb9ec17 100644
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.1
+++ b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/shotgun-0.9.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c991cbd54c8202540b266fd58cf0c2fc
diff --git a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2 b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
index efdd39e6c587..0ac0f5a03467 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-2.11.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/shoulda/tarball/v2.11.3 -> shoulda-2.11.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f6b3370624257afd3ab7af81f83bed51
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
index e321b312703f..416a3d508ea3 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08f09434fdae9ad14e41d3cc7816c050
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.1.6 b/metadata/md5-cache/dev-ruby/shoulda-context-1.1.6
index d03c8cecf35c..9640659b0e04 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.1.6
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-context-1.1.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a30d889acde725009809676a78731c23
diff --git a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1 b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
index c290748095cf..e40c82f53dc9 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-context-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-context-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=748ddcea1e897e222c7c4d9bc27276f4
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
index d104a885b026..ebed049c4a88 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0.0[ruby_targets_ruby1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/shoulda-matchers-2.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c0de3532e6ee7e7a25557a66bd0339f9
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
index 9c751f0d8c29..c7327143d2f6 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ccda46572fa416c938fc272ad9020ab
diff --git a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1 b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
index 8811e89cfb3b..28075f9b5884 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
+++ b/metadata/md5-cache/dev-ruby/shoulda-matchers-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.0.0:*[ruby_targets_rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=mirror://rubygems/shoulda-matchers-3.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ccda46572fa416c938fc272ad9020ab
diff --git a/metadata/md5-cache/dev-ruby/sigar-0.7.3 b/metadata/md5-cache/dev-ruby/sigar-0.7.3
index b3189b60d1af..381979049766 100644
--- a/metadata/md5-cache/dev-ruby/sigar-0.7.3
+++ b/metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sigar-0.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b30f883a2ddab92eadca00bdb4ef98e8
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1
index a3bd48b119e0..3582ec570cb7 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple-rss-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb149be99b62ed35dd15f9c8a7f5297c
diff --git a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1 b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
index 4a5937ab4bc5..929ae46a362c 100644
--- a/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/simple-rss-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple-rss-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e85969c55d4ea010744a0043329a77c8
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
index 6f7c74442714..fca045791eba 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple_oauth-0.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3b9f11c0a16378453ca32a77616c6fc4
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
index c3fe76c7d047..ddf4e7d4ad19 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/simple_oauth-0.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b69076e7fa2c91b3dbd570536579846
diff --git a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1 b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
index 5cbbe43ea99f..d527abe921a8 100644
--- a/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
+++ b/metadata/md5-cache/dev-ruby/simple_oauth-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/laserlemon/simple_oauth/archive/v0.3.1.tar.gz -> simple_oauth-0.3.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e0ed7158d687f0d82660d9ee3013a7a
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.11.1 b/metadata/md5-cache/dev-ruby/simplecov-0.11.1
index 826ebbf5730a..6777dfceddf3 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.11.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.11.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby20] de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.11.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2aad3d4d7b1ea837c7bee39cca06de1b
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.11.2 b/metadata/md5-cache/dev-ruby/simplecov-0.11.2
index 8087773e70e9..fe445b183b24 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.11.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.11.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby20] de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.11.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1afb233ac0ff609b43a5194d8406e402
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.8.2 b/metadata/md5-cache/dev-ruby/simplecov-0.8.2
index c2e09fa141a8..42758cd24fdc 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.8.2
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.8.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cdd6b62ff23da3e886d573fadc2b77f2
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.9.0 b/metadata/md5-cache/dev-ruby/simplecov-0.9.0
index 59c973d20784..a3e16d0ff790 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.9.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.9.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cdd6b62ff23da3e886d573fadc2b77f2
diff --git a/metadata/md5-cache/dev-ruby/simplecov-0.9.1 b/metadata/md5-cache/dev-ruby/simplecov-0.9.1
index f31d78801a3a..2373b6ce03e2 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-0.9.1
+++ b/metadata/md5-cache/dev-ruby/simplecov-0.9.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.0[ruby_targets_ruby19] de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-0.9.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=51df73d433c4fb83df4e910180585868
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.0
index 779190f3bfe8..f61877abf49a 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.10.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.10
 SRC_URI=mirror://rubygems/simplecov-html-0.10.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2e30b4d5564800a04345a106d3a79b33
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.8.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.8.0
index b455f608d637..8233ddc0c9bd 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.8.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.8
 SRC_URI=mirror://rubygems/simplecov-html-0.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9ae1b80257c09fdd4e87df7c5e4e3bb
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.9.0 b/metadata/md5-cache/dev-ruby/simplecov-html-0.9.0
index 6c8458821449..db8138e03bcf 100644
--- a/metadata/md5-cache/dev-ruby/simplecov-html-0.9.0
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0.9
 SRC_URI=mirror://rubygems/simplecov-html-0.9.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0da98b9f641d1cef384276ba2b7a262f
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.6 b/metadata/md5-cache/dev-ruby/sinatra-1.4.6
index 03ab1b7722ef..32dcc0e04a7e 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.6
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rack-1*:*[ruby_targets_ruby19] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29124c03a24e770cf4bae28b427a1a1a
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.6-r1 b/metadata/md5-cache/dev-ruby/sinatra-1.4.6-r1
index 1cffe598ff72..080cbb149c00 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.6-r1
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.6-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rack-1*:*[ruby_targets_ruby19] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04071436e8d9b03217fc989b1fccef18
diff --git a/metadata/md5-cache/dev-ruby/sinatra-1.4.7 b/metadata/md5-cache/dev-ruby/sinatra-1.4.7
index 10917cc8ddeb..bf903f8131ad 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-1.4.7
+++ b/metadata/md5-cache/dev-ruby/sinatra-1.4.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rack-1*:*[ruby_targets_ruby20] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sinatra-1.4.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7e787edbe2eedfb69a0ddd13f19b872
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0 b/metadata/md5-cache/dev-ruby/six-0.2.0
index daa8dbb7935f..1d24149509ce 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7fe87820fdeda52fb9edd21da4abe49
diff --git a/metadata/md5-cache/dev-ruby/slim-2.0.3 b/metadata/md5-cache/dev-ruby/slim-2.0.3
index 2dc612bd7286..d654b45e7391 100644
--- a/metadata/md5-cache/dev-ruby/slim-2.0.3
+++ b/metadata/md5-cache/dev-ruby/slim-2.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/tilt-1.3.3:0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-2.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65005efa5856424d8928a3893e886d1f
diff --git a/metadata/md5-cache/dev-ruby/slim-2.1.0 b/metadata/md5-cache/dev-ruby/slim-2.1.0
index 5309ee88e64c..81da95cd37e3 100644
--- a/metadata/md5-cache/dev-ruby/slim-2.1.0
+++ b/metadata/md5-cache/dev-ruby/slim-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/tilt-1.3.3:0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-2.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f4303aa71dca4f1bcda84589352cade
diff --git a/metadata/md5-cache/dev-ruby/slim-3.0.6 b/metadata/md5-cache/dev-ruby/slim-3.0.6
index 9935ef51b5fe..d1dbdcd29aa2 100644
--- a/metadata/md5-cache/dev-ruby/slim-3.0.6
+++ b/metadata/md5-cache/dev-ruby/slim-3.0.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/tilt-1.3.3:*[ruby_targets_ruby20] <dev
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/slim-3.0.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a193c605aff3161976814938a99ab657
diff --git a/metadata/md5-cache/dev-ruby/slop-3.6.0 b/metadata/md5-cache/dev-ruby/slop-3.6.0
index ce678dad0204..5d9332f7464c 100644
--- a/metadata/md5-cache/dev-ruby/slop-3.6.0
+++ b/metadata/md5-cache/dev-ruby/slop-3.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/injekt/slop/archive/v3.6.0.tar.gz -> slop-3.6.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=67f47e586d084211ae2a730643999f3a
diff --git a/metadata/md5-cache/dev-ruby/slop-4.1.0 b/metadata/md5-cache/dev-ruby/slop-4.1.0
index 8f374994fe27..533c7bea6c50 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.1.0
+++ b/metadata/md5-cache/dev-ruby/slop-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.1.0.tar.gz -> slop-4.1.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=932337c7ccae995ad98632bbc37c90bb
diff --git a/metadata/md5-cache/dev-ruby/slop-4.2.0 b/metadata/md5-cache/dev-ruby/slop-4.2.0
index 68495e88a817..2490d30199eb 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.2.0
+++ b/metadata/md5-cache/dev-ruby/slop-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.2.0.tar.gz -> slop-4.2.0.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=932337c7ccae995ad98632bbc37c90bb
diff --git a/metadata/md5-cache/dev-ruby/slop-4.2.1 b/metadata/md5-cache/dev-ruby/slop-4.2.1
index 92765b347c20..4cc160fce131 100644
--- a/metadata/md5-cache/dev-ruby/slop-4.2.1
+++ b/metadata/md5-cache/dev-ruby/slop-4.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=https://github.com/injekt/slop/archive/v4.2.1.tar.gz -> slop-4.2.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=932337c7ccae995ad98632bbc37c90bb
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.2.0 b/metadata/md5-cache/dev-ruby/snmplib-1.2.0
index d8ea24f3c032..75c929267998 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.2.0
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a54701c7925621f30a59cdafc5441c58
diff --git a/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1 b/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
index 637624ed0ce0..7367e8efeeac 100644
--- a/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/snmplib-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/snmp-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb1cbf6efc5ad9284e4d85b4ab1a1d4d
diff --git a/metadata/md5-cache/dev-ruby/source_map-3.0.1 b/metadata/md5-cache/dev-ruby/source_map-3.0.1
index 8ce0d756a05f..42e88f671e74 100644
--- a/metadata/md5-cache/dev-ruby/source_map-3.0.1
+++ b/metadata/md5-cache/dev-ruby/source_map-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/json[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/source_map-3.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c8a273a4800b7cd5522c9cd1a91f85a
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 d8f9ead668bc..33b1b918af68 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/rmagick ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sparklines-0.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=092d814869448129d161e8fbd1841d73
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r5 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r5
index 797a026f6135..c14b98261511 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r5
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r5
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/rmagick ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sparklines-0.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=226d557b69101261703e873a6d0a37de
diff --git a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6 b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
index 1092d15373fc..3818a358594c 100644
--- a/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
+++ b/metadata/md5-cache/dev-ruby/sparklines-0.5.2-r6
@@ -10,5 +10,5 @@ RDEPEND=dev-ruby/rmagick ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sparklines-0.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2189314eb9d91339b18b884cef921bfa
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r1 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r1
index f93d5b03e493..9e40e4c728af 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r1
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e79aa8028a1005264cb2d65418c193bb
diff --git a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2 b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
index aeeffe5392d3..a7db9e0a89d9 100644
--- a/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
+++ b/metadata/md5-cache/dev-ruby/spork-0.9.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/spork-0.9.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8d4d9427ad2db78d5e18fe30379da22
diff --git a/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9 b/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
index 23dce720c6e3..7ba31692e903 100644
--- a/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
+++ b/metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ruby-ole-1.0[ruby_targets_ruby19] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/spreadsheet-0.6.9.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b270054ddd68da34a7b34a086690a8b
diff --git a/metadata/md5-cache/dev-ruby/spring-1.6.0 b/metadata/md5-cache/dev-ruby/spring-1.6.0
index 08258b3b5030..aaca72b3988f 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.6.0
+++ b/metadata/md5-cache/dev-ruby/spring-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.6.0.tar.gz -> spring-1.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=905ac6ce1247539b7e3d0ad8dd82c4a0
diff --git a/metadata/md5-cache/dev-ruby/spring-1.6.1 b/metadata/md5-cache/dev-ruby/spring-1.6.1
index a4f184aa8078..d0d712fdaa63 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.6.1
+++ b/metadata/md5-cache/dev-ruby/spring-1.6.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.6.1.tar.gz -> spring-1.6.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae9431ad3615c5d694c0bb6f412f8aa6
diff --git a/metadata/md5-cache/dev-ruby/spring-1.6.2 b/metadata/md5-cache/dev-ruby/spring-1.6.2
index 88d8dbde3138..df629f544b81 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.6.2
+++ b/metadata/md5-cache/dev-ruby/spring-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.6.2.tar.gz -> spring-1.6.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55e22f7e4fb61d8f4262f07a776c27be
diff --git a/metadata/md5-cache/dev-ruby/spring-1.6.3 b/metadata/md5-cache/dev-ruby/spring-1.6.3
index 21c173572204..ce92260c4f52 100644
--- a/metadata/md5-cache/dev-ruby/spring-1.6.3
+++ b/metadata/md5-cache/dev-ruby/spring-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.1.0[ruby_targets_ruby20] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.1
 SRC_URI=https://github.com/rails/spring/archive/v1.6.3.tar.gz -> spring-1.6.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55e22f7e4fb61d8f4262f07a776c27be
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.11.3 b/metadata/md5-cache/dev-ruby/sprockets-2.11.3
index bda92dc4bf78..a9b7c0309174 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.11.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.11.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/hike-1*[ruby_targets_ruby19] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.11
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.11.3.tar.gz -> sprockets-2.11.3-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=30530ad3323df3d964f68f94239c6292
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1 b/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
index 73fa4b36366b..df60a05a73fb 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.12.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/hike-1*:0[ruby_targets_ruby19] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.12.3.tar.gz -> sprockets-2.12.3-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b7c68bc4fb1a08d324657e3a948a402d
diff --git a/metadata/md5-cache/dev-ruby/sprockets-2.2.3 b/metadata/md5-cache/dev-ruby/sprockets-2.2.3
index 9f6836232348..f8f028c4ee40 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-2.2.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/hike-1.2:0[ruby_targets_ruby19] =dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/sstephenson/sprockets/archive/v2.2.3.tar.gz -> sprockets-2.2.3-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05f0b8a9925590f90473e17ddeb83505
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.3.5 b/metadata/md5-cache/dev-ruby/sprockets-3.3.5
index d36173c39467..43ac4252f32a 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.3.5
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rack-1*:*[ruby_targets_ruby19] !!<dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.3.5.tar.gz -> sprockets-3.3.5-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=caa7c8fb4d9833fa2d367afee1034a4b
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.4.0 b/metadata/md5-cache/dev-ruby/sprockets-3.4.0
index 1051be841b0e..cdd7b10e2ffc 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.4.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rack-1*:*[ruby_targets_ruby19] !!<dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.4.0.tar.gz -> sprockets-3.4.0-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=caa7c8fb4d9833fa2d367afee1034a4b
diff --git a/metadata/md5-cache/dev-ruby/sprockets-3.4.1 b/metadata/md5-cache/dev-ruby/sprockets-3.4.1
index afe5cf0b3520..f027f906b1d4 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-3.4.1
+++ b/metadata/md5-cache/dev-ruby/sprockets-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/rack-1*:*[ruby_targets_ruby20] !!<dev-r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=3
 SRC_URI=https://github.com/rails/sprockets/archive/v3.4.1.tar.gz -> sprockets-3.4.1-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=006bf81a80b51d9184adfb5c80dec5d9
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
index 6ab627c4f31a..e6c712a0fca1 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.0
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.0.0.tar.gz -> sprockets-rails-2.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=720c2112d475be7dfe0e4f4012afd51b
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
index a0f831466e11..03544f262510 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.1
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.1.3.tar.gz -> sprockets-rails-2.1.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=720c2112d475be7dfe0e4f4012afd51b
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
index 911cae68a277..9e414f56b7b7 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.2
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.2.4.tar.gz -> sprockets-rails-2.2.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=13f7c91c16a888cc3f8ce8f749f8ba34
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.0 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.0
index 5f9b104c1d8a..732a2f9cb950 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.0
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.3.0.tar.gz -> sprockets-rails-2.3.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d68b131caa0d73403f9c3acf7d28668b
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.1-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.1-r1
index c4deea0bb75d..fad088c52875 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.3.1.tar.gz -> sprockets-rails-2.3.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=090658288bc9564cbe27971fdea106df
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.2 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.2
index 9292e9007632..c4f1b6eb9f37 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.2
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.3.2.tar.gz -> sprockets-rails-2.3.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d68b131caa0d73403f9c3acf7d28668b
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3
index 25be862b9f0a..d9fade547ffa 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2.3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.3.3.tar.gz -> sprockets-rails-2.3.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b748e4d272cb380614523a62b7466de8
diff --git a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1 b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
index 594d1182da1b..e6f2276153c8 100644
--- a/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/sprockets-rails-2.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2.3
 SRC_URI=https://github.com/rails/sprockets-rails/archive/v2.3.3.tar.gz -> sprockets-rails-2.3.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17d264afee68b80892ee72c9f85d8f44
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.1 b/metadata/md5-cache/dev-ruby/spy-0.4.1
index c3058fa5e672..cfdee72312e4 100644
--- a/metadata/md5-cache/dev-ruby/spy-0.4.1
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/spy-0.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56379b5d86d6dae226f79beec36d5bcf
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.2 b/metadata/md5-cache/dev-ruby/spy-0.4.2
index 4b3ea5aaea7a..59e107265d94 100644
--- a/metadata/md5-cache/dev-ruby/spy-0.4.2
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/spy-0.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d0f1da5a4ddc4a66b09aa686dd0dd450
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.10 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.10
index 17f072750c97..92c3004f1c10 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.10
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.10
@@ -10,5 +10,5 @@ RDEPEND==dev-db/sqlite-3* ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a35f018ecb01226e33f8b8900c79b70f
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.10-r1 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.10-r1
index 3411ab86c34c..6de27f03bef6 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.10-r1
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.10-r1
@@ -10,5 +10,5 @@ RDEPEND==dev-db/sqlite-3* ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.10.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c478ef38ac0a03938e380f860414d6f
diff --git a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11 b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
index 5a19389aef06..fbffabea6ce4 100644
--- a/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
+++ b/metadata/md5-cache/dev-ruby/sqlite3-1.3.11
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.16:3 ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sqlite3-1.3.11.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4592c88bb757d2fbabb6001833bdfb40
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.7.1 b/metadata/md5-cache/dev-ruby/sshkit-1.7.1
index 6d55a262244d..a204490e6343 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.7.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.8.0[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.7.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b7b75d4ba20d7ee846c899896a5c3c4
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.8.0 b/metadata/md5-cache/dev-ruby/sshkit-1.8.0
index 20df628acf81..a030ff424a0a 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.8.0
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=053124df5e7c0aac30540c9b66bf0cb1
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.8.1 b/metadata/md5-cache/dev-ruby/sshkit-1.8.1
index 2216e9901a76..d65fd9563072 100644
--- a/metadata/md5-cache/dev-ruby/sshkit-1.8.1
+++ b/metadata/md5-cache/dev-ruby/sshkit-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/sshkit-1.8.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=428c04dd4ecf648e150f3c8c334dc12e
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1 b/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
index 9e8c23356537..62b661ba6301 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/stamp-0.5.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.5.0.tar.gz -> stamp-0.5.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3dddf881ea6e800084cc24b56054f51
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
index 87412d39ec08..c79ddffae614 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6dcbc8daa0b38a4d977e6dfc8ffaed2d
diff --git a/metadata/md5-cache/dev-ruby/state_machine-1.2.0 b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
index e4e70baef1dc..ed5f5e466a9b 100644
--- a/metadata/md5-cache/dev-ruby/state_machine-1.2.0
+++ b/metadata/md5-cache/dev-ruby/state_machine-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/state_machine-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b36d5521bb859668276905bbca3bbca4
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.2 b/metadata/md5-cache/dev-ruby/stomp-1.3.2
index e5fedb394b49..327a11ce1629 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.2
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f6ef787f683388ff860721b6fe84086
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.2-r1 b/metadata/md5-cache/dev-ruby/stomp-1.3.2-r1
index eba23f60c67c..d7a0656e9bea 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.2-r1
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b67d9137beba752c87bea2c5482c02d
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.3.4 b/metadata/md5-cache/dev-ruby/stomp-1.3.4
index bb2c18629417..27edee478f24 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.3.4
+++ b/metadata/md5-cache/dev-ruby/stomp-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/stomp-1.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0b67d9137beba752c87bea2c5482c02d
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.5.2 b/metadata/md5-cache/dev-ruby/stringex-2.5.2
index 15527b95f408..a1300d027f2e 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.5.2
+++ b/metadata/md5-cache/dev-ruby/stringex-2.5.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/stringex-2.5.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc507eeb70404dd88200b7288a856555
diff --git a/metadata/md5-cache/dev-ruby/stringex-2.6.0 b/metadata/md5-cache/dev-ruby/stringex-2.6.0
index bb2508238233..bb9bfdd10838 100644
--- a/metadata/md5-cache/dev-ruby/stringex-2.6.0
+++ b/metadata/md5-cache/dev-ruby/stringex-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/stringex-2.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d796f4938a862ecafde6b471a0876e8
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
index 40992a5c8c6b..5ce767952595 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4bb6fb3e878d9861e45114425159bffe
diff --git a/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1 b/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
index 8ded41d2b093..ae0f4a0cb168 100644
--- a/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/syntax-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/dblock/syntax/archive/v1.2.0.tar.gz -> syntax-1.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae35de95c51865d8ddc36f692e779ff4
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.2 b/metadata/md5-cache/dev-ruby/syslogger-1.6.2
index 84a9fb233be4..ce554ae31b37 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.2
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/syslogger-1.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2717b283f53ad3fd77f2376505cba718
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.3 b/metadata/md5-cache/dev-ruby/syslogger-1.6.3
index 9162c5fb5c92..6146f9fb71fd 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.3
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/syslogger-1.6.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2717b283f53ad3fd77f2376505cba718
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.4 b/metadata/md5-cache/dev-ruby/syslogger-1.6.4
index 05d018208921..f4c8578c21fd 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.4
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/syslogger-1.6.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2717b283f53ad3fd77f2376505cba718
diff --git a/metadata/md5-cache/dev-ruby/systemu-2.6.5 b/metadata/md5-cache/dev-ruby/systemu-2.6.5
index 235305976b41..0e656a911925 100644
--- a/metadata/md5-cache/dev-ruby/systemu-2.6.5
+++ b/metadata/md5-cache/dev-ruby/systemu-2.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/systemu-2.6.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5eeb3d03f2f0594a26c1ac07f549324
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.3 b/metadata/md5-cache/dev-ruby/tdiff-0.3.3
index 39f356d759ab..5e706a0e1151 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.3
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tdiff-0.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=34f600cf6d9a82859a43bee85231bc23
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1 b/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
index f2e0f2f45076..ffbfda1183ba 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tdiff-0.3.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=00926d51e4fb7b9f154e6b71fb604927
diff --git a/metadata/md5-cache/dev-ruby/temple-0.6.10 b/metadata/md5-cache/dev-ruby/temple-0.6.10
index 42956d90cb2f..1a89234d7f07 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.6.10
+++ b/metadata/md5-cache/dev-ruby/temple-0.6.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91bef8ee112169405ee4e7abf21995e7
diff --git a/metadata/md5-cache/dev-ruby/temple-0.7.6 b/metadata/md5-cache/dev-ruby/temple-0.7.6
index 5265f55ea3a5..2de8f5024b9b 100644
--- a/metadata/md5-cache/dev-ruby/temple-0.7.6
+++ b/metadata/md5-cache/dev-ruby/temple-0.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb8271f8be4b342832d9f5b6ece8bfab
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 275767004ec4..bcf009665f81 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
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f75eeca096e4064456c48b6cc4a664e
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 d7f38777c0ef..2549d8c02751 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64a32da9d9895c9f75383ba5c6f2c4bf
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0-r1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0-r1
index 2a4a247d423c..f7843e92019f 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0-r1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/tins-1.0[ruby_targets_ruby20] ) ruby_t
 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2f076490c108b6b53fe40ac01a4882d
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
index 6d65cd477553..ecf5bdba629c 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/tins-1.0[ruby_targets_ruby20] ) ruby_t
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/term-ansicolor-1.3.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2f076490c108b6b53fe40ac01a4882d
diff --git a/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1 b/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
index 91a47c62d5da..4381285b1601 100644
--- a/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/termcolor-1.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/termcolor-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49d752159edc2ff861f579c05ba56fcd
diff --git a/metadata/md5-cache/dev-ruby/termcolor-1.2.2 b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
index afcb40f74718..d4020e5dfede 100644
--- a/metadata/md5-cache/dev-ruby/termcolor-1.2.2
+++ b/metadata/md5-cache/dev-ruby/termcolor-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/highline-1.5.0[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/termcolor-1.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c7949d1fd13c87cbc0e22fd001c7c3c7
diff --git a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r1
index c644eaf76e57..74e7d9a038ff 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-1.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c800044dad2e89b599d3013a2a75604
diff --git a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r2 b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r2
index 06b4836ed291..279ec782f678 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-1.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1d0ce76e2a82a97f791c8b4a44f8c5f
diff --git a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3 b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
index bb545a6da779..30f68397f834 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
+++ b/metadata/md5-cache/dev-ruby/test-unit-1.2.3-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-1.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4207f937004a42161582ede79fb5d32
diff --git a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2 b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
index a0251c6e95fa..1e7c2ac7ed79 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
+++ b/metadata/md5-cache/dev-ruby/test-unit-2.5.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-2.5.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9ca40c062c5958e35d24c58e3dcec3a3
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.3 b/metadata/md5-cache/dev-ruby/test-unit-3.1.3
index b0988837737a..3eac7abd347a 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.3
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/power_assert[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb3c5a7908b8943405e5bd4866934a4a
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.4 b/metadata/md5-cache/dev-ruby/test-unit-3.1.4
index a29434d9ce52..f961bacf5819 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.4
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/power_assert[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb3c5a7908b8943405e5bd4866934a4a
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.5 b/metadata/md5-cache/dev-ruby/test-unit-3.1.5
index 8f2b1c3b6cec..9e05a5e8e036 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/power_assert[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.1.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb3c5a7908b8943405e5bd4866934a4a
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.5-r1 b/metadata/md5-cache/dev-ruby/test-unit-3.1.5-r1
index 0bc6d029e75b..9011cc2456f3 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/power_assert[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.1.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5dcbbcb5b9985cdd92e6a2557858ee28
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.7 b/metadata/md5-cache/dev-ruby/test-unit-3.1.7
index 235f415141c3..730bd7eaa655 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.7
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/power_assert[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.1.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b4fd6d44209514cb7432a7e550e99fa
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3
index fe978f3add3e..04160997676a 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby19] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8780e894f78a57a3f4c0c9117710e75
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
index 4b46e2972ee8..d74dfca3371a 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby19] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d2ff4bc6f025720b9247c4ebbf2f1b7
diff --git a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5 b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
index 787c055877fb..bc9e8996d72f 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
+++ b/metadata/md5-cache/dev-ruby/test-unit-rr-1.0.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rr-1.1.1[ruby_targets_ruby20] >=dev-ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/test-unit-rr-1.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1780bf5a3178203068749eccab78b519
diff --git a/metadata/md5-cache/dev-ruby/test_construct-2.0.1 b/metadata/md5-cache/dev-ruby/test_construct-2.0.1
index c91669c95cf1..0e0efbbb9b32 100644
--- a/metadata/md5-cache/dev-ruby/test_construct-2.0.1
+++ b/metadata/md5-cache/dev-ruby/test_construct-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/test_construct-2.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=304cc0ea249ae3327a7c21033a24d450
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
index 523c17f79d12..4839e4d9e6a6 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.5-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/tarball/v0.0.5 -> test_declarative-0.0.5.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df9a77a60c03dd3acaedf19a28a967b7
diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3-r1 b/metadata/md5-cache/dev-ruby/text-1.2.3-r1
index 7fd6aeed9b27..a75d085b4a22 100644
--- a/metadata/md5-cache/dev-ruby/text-1.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/text-1.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d3b391398427d58bd047f0ea9ca6cc70
diff --git a/metadata/md5-cache/dev-ruby/text-1.2.3-r2 b/metadata/md5-cache/dev-ruby/text-1.2.3-r2
index fb26d17fc870..f56c58088f77 100644
--- a/metadata/md5-cache/dev-ruby/text-1.2.3-r2
+++ b/metadata/md5-cache/dev-ruby/text-1.2.3-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4324c8df98a60e88937f7b835f12c50b
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.0 b/metadata/md5-cache/dev-ruby/text-1.3.0
index c167b1db88f7..21c407c99c9b 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.0
+++ b/metadata/md5-cache/dev-ruby/text-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3d9fee27c0e3e01657f87f56086f0f14
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1 b/metadata/md5-cache/dev-ruby/text-1.3.1
index aa3945704995..ef5042767107 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cb28adae2effc417e14a8ef33f8dd7d6
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
index 18b63fcd1ee6..0e3772b12f51 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d9fb490bf599786135fa7838114b02c
diff --git a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2 b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
index dae94b34d710..b54a4cec8171 100644
--- a/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/text-hyphen-1.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc8c796b59fde04c8d34706f38c93ae8
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.3.1-r1 b/metadata/md5-cache/dev-ruby/textpow-1.3.1-r1
index 438b67332474..4dd2bc961b64 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/textpow-1.3.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/textpow-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=135b60ab1f22261dec856de57d424249
diff --git a/metadata/md5-cache/dev-ruby/textpow-1.4.0 b/metadata/md5-cache/dev-ruby/textpow-1.4.0
index 917def0e4b18..0241d336d00a 100644
--- a/metadata/md5-cache/dev-ruby/textpow-1.4.0
+++ b/metadata/md5-cache/dev-ruby/textpow-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/plist-3.0.1[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/grosser/textpow/archive/v1.4.0.tar.gz -> textpow-1.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f356c08383aaa5e3aa1ebd5f45ef82c
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.1 b/metadata/md5-cache/dev-ruby/thor-0.19.1
index 9db608ef0cc4..9fc2ced41c50 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.19.1
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.19.1.tar.gz -> thor-git-0.19.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f76c449bd08f59d90d6dbc06ce704ec
diff --git a/metadata/md5-cache/dev-ruby/thread_order-1.1.0 b/metadata/md5-cache/dev-ruby/thread_order-1.1.0
index 83eb9f09c3af..c61703283656 100644
--- a/metadata/md5-cache/dev-ruby/thread_order-1.1.0
+++ b/metadata/md5-cache/dev-ruby/thread_order-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_order-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a096c6412fb02646ee3ffdb84a92376a
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.4 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.4
index beb78496d1da..44ba12f58611 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.4
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f9868d3ea7f29608a0fd54cab0a35ca
diff --git a/metadata/md5-cache/dev-ruby/thread_safe-0.3.5 b/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
index 8bf982d4de79..52330b445137 100644
--- a/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
+++ b/metadata/md5-cache/dev-ruby/thread_safe-0.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/thread_safe-0.3.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76da848155b955b87e3f87a912ad933d
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r1 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r1
index 0cb96dc8dde3..4494372001b9 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r1
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0206af82a4b8c972516f2f066d1102d4
diff --git a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2 b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
index 22b67971e37c..d769ca3fe9e0 100644
--- a/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
+++ b/metadata/md5-cache/dev-ruby/tidy-ext-0.1.14-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy-ext-0.1.14.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5fa5c2c3ad7acc3f3e12776ab0255067
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r3 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r3
index 02b2842e432c..81607cb374c8 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r3
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy_table-0.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d99b6eb0f5e78f3599cd4debb201ef2
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
index 43423833f744..7aedfd4d074c 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tidy_table-0.0.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1a33ae87e064214ffcf8fd9e099c5dc
diff --git a/metadata/md5-cache/dev-ruby/tilt-1.4.1 b/metadata/md5-cache/dev-ruby/tilt-1.4.1
index 01f666b20e8d..cd7b69d662c5 100644
--- a/metadata/md5-cache/dev-ruby/tilt-1.4.1
+++ b/metadata/md5-cache/dev-ruby/tilt-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tilt-1.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=114be5a88b1030ed49c9c526c82802b0
diff --git a/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2 b/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
index 9437028f5975..688558495061 100644
--- a/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
+++ b/metadata/md5-cache/dev-ruby/tilt-1.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.0.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/tilt-1.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e18e8400a437c3b67b36432b7fe62d2
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.1-r1 b/metadata/md5-cache/dev-ruby/tilt-2.0.1-r1
index f366c2e4b599..9c948e9688c1 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby19] !
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/tilt-2.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49f6c33e70673b190e1baff7c2acad69
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.2 b/metadata/md5-cache/dev-ruby/tilt-2.0.2
index 66630bfa0d3f..a970642508c1 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.2
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/builder-2.0.0:*[ruby_targets_ruby20] !
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/tilt-2.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be20b831ff2f949dc51b5ec70a9d8f63
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.1 b/metadata/md5-cache/dev-ruby/timecop-0.7.1
index 09af31ef5255..7e08e75dbf4b 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.7.1
+++ b/metadata/md5-cache/dev-ruby/timecop-0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.7.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a40194cf360e6be1ed2259ac40f0bfe
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.7.4 b/metadata/md5-cache/dev-ruby/timecop-0.7.4
index 3cd0bd98b11a..ffdfb6703f18 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.7.4
+++ b/metadata/md5-cache/dev-ruby/timecop-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.7.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77e336810408a78cd0ae41d35332f82b
diff --git a/metadata/md5-cache/dev-ruby/timecop-0.8.0 b/metadata/md5-cache/dev-ruby/timecop-0.8.0
index cfe3823e2268..8ea7c62a27fb 100644
--- a/metadata/md5-cache/dev-ruby/timecop-0.8.0
+++ b/metadata/md5-cache/dev-ruby/timecop-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/timecop-0.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a2048ae0071172fc99dc7f4295b89c6d
diff --git a/metadata/md5-cache/dev-ruby/timers-4.0.1 b/metadata/md5-cache/dev-ruby/timers-4.0.1
index 8c3145233432..a55742fa20e8 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.0.1
+++ b/metadata/md5-cache/dev-ruby/timers-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hitimes[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76e328539d355ed8b2d6da6aa9a6238e
diff --git a/metadata/md5-cache/dev-ruby/timers-4.1.0 b/metadata/md5-cache/dev-ruby/timers-4.1.0
index 0ee7e72d73c3..a65dc19ca6be 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.1.0
+++ b/metadata/md5-cache/dev-ruby/timers-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hitimes[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76e328539d355ed8b2d6da6aa9a6238e
diff --git a/metadata/md5-cache/dev-ruby/timers-4.1.1 b/metadata/md5-cache/dev-ruby/timers-4.1.1
index 1f496242c6c8..010ebd0ee825 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.1.1
+++ b/metadata/md5-cache/dev-ruby/timers-4.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/hitimes[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76e328539d355ed8b2d6da6aa9a6238e
diff --git a/metadata/md5-cache/dev-ruby/tins-0.13.1 b/metadata/md5-cache/dev-ruby/tins-0.13.1
index 1066502c45d7..dd97f189e2e7 100644
--- a/metadata/md5-cache/dev-ruby/tins-0.13.1
+++ b/metadata/md5-cache/dev-ruby/tins-0.13.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-0.13.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b271e5d310039b08f3a41c16c7fe6a22
diff --git a/metadata/md5-cache/dev-ruby/tins-1.6.0 b/metadata/md5-cache/dev-ruby/tins-1.6.0
index 95c4115ccf9b..98b658b0a7b5 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.6.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.6.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=48e0d8bbcbe1ee52e6ff9369fbc6dc37
diff --git a/metadata/md5-cache/dev-ruby/tins-1.7.0 b/metadata/md5-cache/dev-ruby/tins-1.7.0
index 58dc38d6f50b..3f051a353d33 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.7.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f6c7711fd61537db92d164e1a5a241bc
diff --git a/metadata/md5-cache/dev-ruby/tins-1.8.0 b/metadata/md5-cache/dev-ruby/tins-1.8.0
index 1eb9fe017482..6dcff223a0be 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.8.0
+++ b/metadata/md5-cache/dev-ruby/tins-1.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f6c7711fd61537db92d164e1a5a241bc
diff --git a/metadata/md5-cache/dev-ruby/tins-1.8.1 b/metadata/md5-cache/dev-ruby/tins-1.8.1
index 4483e5430e96..0a90ef17d608 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.8.1
+++ b/metadata/md5-cache/dev-ruby/tins-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.8.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f6c7711fd61537db92d164e1a5a241bc
diff --git a/metadata/md5-cache/dev-ruby/tins-1.8.2 b/metadata/md5-cache/dev-ruby/tins-1.8.2
index 80e3e3840f15..02142efd20e8 100644
--- a/metadata/md5-cache/dev-ruby/tins-1.8.2
+++ b/metadata/md5-cache/dev-ruby/tins-1.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/tins-1.8.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec5498d2c120b9c076419da7d2b6eb40
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1
index 72379c91dee3..fa12348f434e 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.29.1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/tokyocabinet ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tokyocabinet-1.29.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90ab525ab4050b88122c3d0800e4d726
diff --git a/metadata/md5-cache/dev-ruby/toml-0.1.2 b/metadata/md5-cache/dev-ruby/toml-0.1.2
index ce03cdecbc64..9f98d5eb2800 100644
--- a/metadata/md5-cache/dev-ruby/toml-0.1.2
+++ b/metadata/md5-cache/dev-ruby/toml-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/parslet[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jm/toml/archive/v0.1.2.tar.gz -> toml-0.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=222ae93cd64980289a8727429f01a3e6
diff --git a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0 b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
index 74acac4d621a..e0d4493f50e7 100644
--- a/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
+++ b/metadata/md5-cache/dev-ruby/totoridipjp-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/totoridipjp-0.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b43af2d3408ea0cd33b32aeb6acdeef8
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1
index 1a2200b25c12..fa5c58c0c01d 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/transaction-simple-1.4.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=16144c66a30d8c16119676b60671a644
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
index d7cc61b099af..2d90e275ea2f 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/transaction-simple-1.4.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2ff7c291182102d528212349ca1048aa
diff --git a/metadata/md5-cache/dev-ruby/travis-1.8.2 b/metadata/md5-cache/dev-ruby/travis-1.8.2
index 6226dc2dddf6..c72e9e992993 100644
--- a/metadata/md5-cache/dev-ruby/travis-1.8.2
+++ b/metadata/md5-cache/dev-ruby/travis-1.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/travis-1.8.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1801813f27de8aafd4982483674a1aab
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.4.15-r1 b/metadata/md5-cache/dev-ruby/treetop-1.4.15-r1
deleted file mode 100644
index 4bca7773716e..000000000000
--- a/metadata/md5-cache/dev-ruby/treetop-1.4.15-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rr-0.10.2[ruby_targets_ruby19] dev-ruby/activesupport[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rr-0.10.2[ruby_targets_ruby20] dev-ruby/activesupport[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rr-0.10.2[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1[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] ) )
-DESCRIPTION=Treetop is a language for describing languages
-EAPI=5
-HOMEPAGE=http://treetop.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc 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=Ruby
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1[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 )
-SLOT=0
-SRC_URI=mirror://rubygems/treetop-1.4.15.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=66897103bec0a566d8fdb369cc074a3d
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.5.3 b/metadata/md5-cache/dev-ruby/treetop-1.5.3
deleted file mode 100644
index 90aa8d7c5178..000000000000
--- a/metadata/md5-cache/dev-ruby/treetop-1.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby19] dev-ruby/activesupport[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby20] dev-ruby/activesupport[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1[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] ) )
-DESCRIPTION=Treetop is a language for describing languages
-EAPI=5
-HOMEPAGE=https://github.com/cjheath/treetop
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc 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=Ruby
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1[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 )
-SLOT=0
-SRC_URI=mirror://rubygems/treetop-1.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7fdb5aef7e7e47c450db32f63a481244
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.3 b/metadata/md5-cache/dev-ruby/treetop-1.6.3
index 8151697d179c..90dd8acecd20 100644
--- a/metadata/md5-cache/dev-ruby/treetop-1.6.3
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/treetop-1.6.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9a8d298d7ed5c1e6f287f145b9a0f793
diff --git a/metadata/md5-cache/dev-ruby/treetop-1.6.4 b/metadata/md5-cache/dev-ruby/treetop-1.6.4
new file mode 100644
index 000000000000..3cd43efd8bce
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/treetop-1.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby20] dev-ruby/activesupport[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rr-1.0[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.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: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=Treetop is a language for describing languages
+EAPI=5
+HOMEPAGE=https://github.com/cjheath/treetop
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc 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=Ruby
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/polyglot-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/polyglot-0.3.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=mirror://rubygems/treetop-1.6.4.gem
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d35f219292beb0f13b398a881160a7f7
diff --git a/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4 b/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
index bd88790a91bb..d827b6de2942 100644
--- a/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
+++ b/metadata/md5-cache/dev-ruby/trollop-1.16.2-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/trollop-1.16.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=408fd45abbea5fd5790b2285a942e44b
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.0 b/metadata/md5-cache/dev-ruby/trollop-2.0
index 0faa1ef689a3..6a6ac2e94082 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.0
+++ b/metadata/md5-cache/dev-ruby/trollop-2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=2
 SRC_URI=mirror://rubygems/trollop-2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c437b76b738794b833182f410f98cf1d
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.1.1 b/metadata/md5-cache/dev-ruby/trollop-2.1.1
index 633871b12b84..ad0c16a45ad3 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.1.1
+++ b/metadata/md5-cache/dev-ruby/trollop-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/trollop-2.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=529200efe3d6cee3d556887a80c4ce46
diff --git a/metadata/md5-cache/dev-ruby/trollop-2.1.2 b/metadata/md5-cache/dev-ruby/trollop-2.1.2
index dda6e951b806..da9639926a47 100644
--- a/metadata/md5-cache/dev-ruby/trollop-2.1.2
+++ b/metadata/md5-cache/dev-ruby/trollop-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/trollop-2.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db3f1cfcbf786b5fdb0b7897d1b22784
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1 b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
index 7925341ed4a7..081bffc35b82 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.2
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.2.1.tar.gz -> ttfunk-1.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c56caa86bf495b4defd618c7834f445
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
index e5752e6dcf8f..c0452e5d7da9 100644
--- a/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1.4
 SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.4.0.tar.gz -> ttfunk-1.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c56caa86bf495b4defd618c7834f445
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-2.5.1 b/metadata/md5-cache/dev-ruby/turbolinks-2.5.1
index 3a1850fcfee2..b55a726fda3d 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-2.5.1
+++ b/metadata/md5-cache/dev-ruby/turbolinks-2.5.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-rails[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/turbolinks-2.5.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6c224236b9c942a61408c2bcf297256
diff --git a/metadata/md5-cache/dev-ruby/turbolinks-2.5.3 b/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
index bccd1fc397d3..8f116d7e5ee8 100644
--- a/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
+++ b/metadata/md5-cache/dev-ruby/turbolinks-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/coffee-rails[ruby_targets_ruby19] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/turbolinks-2.5.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6c224236b9c942a61408c2bcf297256
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.13.0 b/metadata/md5-cache/dev-ruby/twitter-5.13.0
index 776fbb195c7a..bd65e1be5d01 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.13.0
+++ b/metadata/md5-cache/dev-ruby/twitter-5.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.13.0.tar.gz -> twitter-5.13.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4525da962a2c8914bb9596da2e88782
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.14.0 b/metadata/md5-cache/dev-ruby/twitter-5.14.0
index a52aea568f67..a3f18b1493f6 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.14.0
+++ b/metadata/md5-cache/dev-ruby/twitter-5.14.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.14.0.tar.gz -> twitter-5.14.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97955370449cf6b718d7e5705aa6fd11
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.15.0 b/metadata/md5-cache/dev-ruby/twitter-5.15.0
index b0fe37b39412..b1aaee0ecd4d 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.15.0
+++ b/metadata/md5-cache/dev-ruby/twitter-5.15.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.15.0.tar.gz -> twitter-5.15.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6fa0cba1984bae92d811a0d90910ece9
diff --git a/metadata/md5-cache/dev-ruby/twitter-5.16.0 b/metadata/md5-cache/dev-ruby/twitter-5.16.0
index 74ee1f050a17..5265c7cd3eec 100644
--- a/metadata/md5-cache/dev-ruby/twitter-5.16.0
+++ b/metadata/md5-cache/dev-ruby/twitter-5.16.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=5
 SRC_URI=https://github.com/sferik/twitter/archive/v5.16.0.tar.gz -> twitter-5.16.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be0618e0339cb4f996883c0c727f4ce6
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-1.13.0 b/metadata/md5-cache/dev-ruby/twitter-text-1.13.0
index 755c86b65fe5..05e02d88f616 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-1.13.0
+++ b/metadata/md5-cache/dev-ruby/twitter-text-1.13.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( =dev-ruby/unf-0.1*[ruby_targets_ruby19] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/twitter-text-1.13.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=46e28fe08a090f102c8f24885e0350cc
diff --git a/metadata/md5-cache/dev-ruby/twitter-text-1.13.3 b/metadata/md5-cache/dev-ruby/twitter-text-1.13.3
index e2992a3fe294..5cb75120eb0c 100644
--- a/metadata/md5-cache/dev-ruby/twitter-text-1.13.3
+++ b/metadata/md5-cache/dev-ruby/twitter-text-1.13.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( =dev-ruby/unf-0.1*[ruby_targets_ruby20] ) ruby_ta
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/twitter-text-1.13.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=591f1a41a84ad7ea274fc08d80a07804
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
index aae1368f7be6..05267a6cc0e8 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/typed-array-0.1.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=563e408297d2341bb1bc8548e4743ceb
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.7.3 b/metadata/md5-cache/dev-ruby/typhoeus-0.7.3
index 6a269fb320ad..5221d1ada0e5 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.7.3
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ethon-0.7.4[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/typhoeus-0.7.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b58c3b18fa440a55a2875586738fae53
diff --git a/metadata/md5-cache/dev-ruby/typhoeus-0.8.0 b/metadata/md5-cache/dev-ruby/typhoeus-0.8.0
index 1a9e4accb6fc..81d279c3f91d 100644
--- a/metadata/md5-cache/dev-ruby/typhoeus-0.8.0
+++ b/metadata/md5-cache/dev-ruby/typhoeus-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/ethon-0.8.0[ruby_targets_ruby19] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby19 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	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f32b28368c3eaa34766ed54e27aeb1fa
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.43 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.43
index 2fd10f181abf..eed03578273d 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.43
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.43
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.43.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2edfb1942278174b02ca0ab361bc2474
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.43-r1 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.43-r1
index 312d4c364c56..7ec91cd522fe 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.43-r1
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.43-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.43.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8a91daa1b76a83c48b1cc94dfa0a1ec3
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-0.3.44 b/metadata/md5-cache/dev-ruby/tzinfo-0.3.44
index cfdd4920ce17..51c318977852 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-0.3.44
+++ b/metadata/md5-cache/dev-ruby/tzinfo-0.3.44
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/tzinfo-0.3.44.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8a91daa1b76a83c48b1cc94dfa0a1ec3
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
index 2101f01a686e..8dd51836a7ae 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/timezone-data ruby_targets_ruby19? ( >=dev-ruby/thread_safe-0.1
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87c046649e1a329c55870554502863f4
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r1 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r1
index 5cc7b48c5bd6..2dd642a152e4 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r1
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e30d7a9eb8da668b4c949fbad581259
diff --git a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2 b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
index 6a528e8bfd7f..a65bef3f8070 100644
--- a/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
+++ b/metadata/md5-cache/dev-ruby/uconv-0.6.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://www.yoshidam.net/uconv-0.6.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50a9eae9677b7d9ada262fa1ee227b3f
diff --git a/metadata/md5-cache/dev-ruby/uglifier-2.7.0 b/metadata/md5-cache/dev-ruby/uglifier-2.7.0
index 162ab72caf2e..460f224590dd 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-2.7.0
+++ b/metadata/md5-cache/dev-ruby/uglifier-2.7.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/uglifier-2.7.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=878ea93f3140927ee509373db24b5b8d
diff --git a/metadata/md5-cache/dev-ruby/uglifier-2.7.1 b/metadata/md5-cache/dev-ruby/uglifier-2.7.1
index 9cec36483a35..398683abf8c3 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-2.7.1
+++ b/metadata/md5-cache/dev-ruby/uglifier-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/execjs-0.3.0[ruby_targets_ruby19] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/uglifier-2.7.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d452985fe1c5ab9236ec0a639dc55de0
diff --git a/metadata/md5-cache/dev-ruby/uglifier-2.7.2 b/metadata/md5-cache/dev-ruby/uglifier-2.7.2
index dcd98c7b4592..d973d890f736 100644
--- a/metadata/md5-cache/dev-ruby/uglifier-2.7.2
+++ b/metadata/md5-cache/dev-ruby/uglifier-2.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/execjs-0.3.0:*[ruby_targets_ruby19] >=
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/uglifier-2.7.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ebc9e876b77bbaa4ace03eca0fc54753
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
index e2c140d5de0e..2af877ca6936 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby19] ) r
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ultraviolet-1.0.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=606b378a8e0ccdc7c17f9058bc2a8588
diff --git a/metadata/md5-cache/dev-ruby/unf-0.1.4 b/metadata/md5-cache/dev-ruby/unf-0.1.4
index 65d97238099a..a2b4ab5706a8 100644
--- a/metadata/md5-cache/dev-ruby/unf-0.1.4
+++ b/metadata/md5-cache/dev-ruby/unf-0.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/unf_ext[ruby_targets_ruby19] ) ruby_targ
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf-0.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1e5bdabad4e0d48b585c9357f259578
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
index 0e7596e35cfa..5a9f47cb5fbd 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0dd162e20c4746d2985f5dabb3d46182
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
index 738137779101..da07be645808 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.7.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unf_ext-0.0.7.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08623f75838bdacb163226ae83ffe384
diff --git a/metadata/md5-cache/dev-ruby/unindent-1.0 b/metadata/md5-cache/dev-ruby/unindent-1.0
index 5f8aaf2e76b5..48cdd870ea20 100644
--- a/metadata/md5-cache/dev-ruby/unindent-1.0
+++ b/metadata/md5-cache/dev-ruby/unindent-1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/unindent-1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0faa337eb9ebcd2ee8cb5793b9a05da5
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
index 3dc2f8d20ac8..b8ed2af2a9e4 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/uuidtools-2.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed41527430c23be32291d33521ab7b3a
diff --git a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5 b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
index dd25005f4851..77ad572e8d9a 100644
--- a/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
+++ b/metadata/md5-cache/dev-ruby/uuidtools-2.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/uuidtools-2.1.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02a84c55ac92b613c80eb8643cc8d4c1
diff --git a/metadata/md5-cache/dev-ruby/vcard-0.2.12 b/metadata/md5-cache/dev-ruby/vcard-0.2.12
index 81d841501413..679fb5a64cb1 100644
--- a/metadata/md5-cache/dev-ruby/vcard-0.2.12
+++ b/metadata/md5-cache/dev-ruby/vcard-0.2.12
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/vcard-0.2.12.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1618a813603f802a317228777e4b5084
diff --git a/metadata/md5-cache/dev-ruby/vcr-1.11.3 b/metadata/md5-cache/dev-ruby/vcr-1.11.3
index 04214310d887..252fa6b5e318 100644
--- a/metadata/md5-cache/dev-ruby/vcr-1.11.3
+++ b/metadata/md5-cache/dev-ruby/vcr-1.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/vcr-1.11.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08951d9b09467c7f5ca7ac890fc1dd13
diff --git a/metadata/md5-cache/dev-ruby/vcr-2.9.3 b/metadata/md5-cache/dev-ruby/vcr-2.9.3
index 0d053dbd2960..52a8f4983449 100644
--- a/metadata/md5-cache/dev-ruby/vcr-2.9.3
+++ b/metadata/md5-cache/dev-ruby/vcr-2.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://rubygems/vcr-2.9.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a684b5799bf8705eb2d98cdf2ea4c3e5
diff --git a/metadata/md5-cache/dev-ruby/vcr-3.0.0 b/metadata/md5-cache/dev-ruby/vcr-3.0.0
index 8d007d6a7b37..88d26759d1f1 100644
--- a/metadata/md5-cache/dev-ruby/vcr-3.0.0
+++ b/metadata/md5-cache/dev-ruby/vcr-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v3.0.0.tar.gz -> vcr-3.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c89cea1f9bee59c3dfcb1995da9fe37
diff --git a/metadata/md5-cache/dev-ruby/vcr-3.0.1 b/metadata/md5-cache/dev-ruby/vcr-3.0.1
index 745345259375..ce5608f2edde 100644
--- a/metadata/md5-cache/dev-ruby/vcr-3.0.1
+++ b/metadata/md5-cache/dev-ruby/vcr-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/vcr/vcr/archive/v3.0.1.tar.gz -> vcr-3.0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d04e446ba18a763daf4b0df9dbb75a91
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.6.3 b/metadata/md5-cache/dev-ruby/vlad-2.6.3
index caceb0714bf8..b9aad87aa8ed 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.6.3
+++ b/metadata/md5-cache/dev-ruby/vlad-2.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/vlad-2.6.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1a00936e8be47ddb87e001dce02b01c
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.6.4 b/metadata/md5-cache/dev-ruby/vlad-2.6.4
index 61d54963d3b6..e434afd7ff12 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.6.4
+++ b/metadata/md5-cache/dev-ruby/vlad-2.6.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.1[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/vlad-2.6.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1a00936e8be47ddb87e001dce02b01c
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.6.5 b/metadata/md5-cache/dev-ruby/vlad-2.6.5
index 782f3e03a8b3..084af7b3b8d6 100644
--- a/metadata/md5-cache/dev-ruby/vlad-2.6.5
+++ b/metadata/md5-cache/dev-ruby/vlad-2.6.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/vlad-2.6.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=068d4b78065501d46fcb0ea8f926dec2
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.3 b/metadata/md5-cache/dev-ruby/warden-1.2.3
index 04d79cb52da3..ebb63826f230 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.3
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/warden-1.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=847c18df934672fd7add07e750dcf5b3
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.4 b/metadata/md5-cache/dev-ruby/warden-1.2.4
index fde061b74fb7..5035f5ded9b5 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.4
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/warden-1.2.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0699ca1a84aaebe9df3d8863b1d9ae0e
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.5 b/metadata/md5-cache/dev-ruby/warden-1.2.5
index 5d4e05ee5b99..ed19b3d511cd 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.5
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/warden-1.2.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b333a9c6d8c81420a4a2041edb8f93b
diff --git a/metadata/md5-cache/dev-ruby/warden-1.2.6 b/metadata/md5-cache/dev-ruby/warden-1.2.6
index 41530136a45e..b8b1eed84da2 100644
--- a/metadata/md5-cache/dev-ruby/warden-1.2.6
+++ b/metadata/md5-cache/dev-ruby/warden-1.2.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/warden-1.2.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b333a9c6d8c81420a4a2041edb8f93b
diff --git a/metadata/md5-cache/dev-ruby/watch-0.1.0 b/metadata/md5-cache/dev-ruby/watch-0.1.0
index f708855528fe..cf9a98ff70e7 100644
--- a/metadata/md5-cache/dev-ruby/watch-0.1.0
+++ b/metadata/md5-cache/dev-ruby/watch-0.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/watch-0.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ce8fba0ccdbcc7f6d57844a1edf8b91
diff --git a/metadata/md5-cache/dev-ruby/weakling-0.0.4 b/metadata/md5-cache/dev-ruby/weakling-0.0.4
index b72e73aa6d3e..98736193c525 100644
--- a/metadata/md5-cache/dev-ruby/weakling-0.0.4
+++ b/metadata/md5-cache/dev-ruby/weakling-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-java/bytelist dev-java/jruby >=virtual/jre-1.5 >=dev-java/java-confi
 REQUIRED_USE=|| ( ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/weakling-0.0.4-java.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e6ab0c003eae0f36d9a46b886c13c07
diff --git a/metadata/md5-cache/dev-ruby/web-console-2.2.1-r1 b/metadata/md5-cache/dev-ruby/web-console-2.2.1-r1
index 6ca55352fe8b..7ed1979567a0 100644
--- a/metadata/md5-cache/dev-ruby/web-console-2.2.1-r1
+++ b/metadata/md5-cache/dev-ruby/web-console-2.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activemodel-4.0:*[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/rails/web-console/archive/v2.2.1.tar.gz -> web-console-2.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17808c47c2b7b6c8c8184041efd3870a
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.19.0 b/metadata/md5-cache/dev-ruby/webmock-1.19.0
index 926841863353..d143e2e129c4 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.19.0
+++ b/metadata/md5-cache/dev-ruby/webmock-1.19.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.19.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f047d262128380b3dade5aad1f1f98ad
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.20.3 b/metadata/md5-cache/dev-ruby/webmock-1.20.3
index 7ac2a9751fa7..f992341af3ca 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.20.3
+++ b/metadata/md5-cache/dev-ruby/webmock-1.20.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.20.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8966117b8c82b00bea1e846976e31cf
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.22.1 b/metadata/md5-cache/dev-ruby/webmock-1.22.1
index a6c0bd3e8624..7d9191a970e2 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.22.1
+++ b/metadata/md5-cache/dev-ruby/webmock-1.22.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.22.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0cd173fb674a8d9b5b4f8afe47ef8daf
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.22.3 b/metadata/md5-cache/dev-ruby/webmock-1.22.3
index 90dd4ebac7b0..6bdcdb9645b3 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.22.3
+++ b/metadata/md5-cache/dev-ruby/webmock-1.22.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.22.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb456cb76bc504c4b69a68bff66cea22
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.22.5 b/metadata/md5-cache/dev-ruby/webmock-1.22.5
index bacc5219751d..a77129097568 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.22.5
+++ b/metadata/md5-cache/dev-ruby/webmock-1.22.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.22.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=419ebc10283be964176855ec79105798
diff --git a/metadata/md5-cache/dev-ruby/webmock-1.22.6 b/metadata/md5-cache/dev-ruby/webmock-1.22.6
index 7abed41c7565..7ca2cf5cf5bb 100644
--- a/metadata/md5-cache/dev-ruby/webmock-1.22.6
+++ b/metadata/md5-cache/dev-ruby/webmock-1.22.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/webmock-1.22.6.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cba1e1703d721bc16f0d42290c5e1660
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r1 b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r1
index 9a3c3c686094..b7c8998d1f4c 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r1
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64807e6d369abd6685bf46ac4515a80a
diff --git a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2 b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
index e24477b5e75b..b975b693d911 100644
--- a/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/webrobots-0.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/webrobots-0.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7e76ee7686c6d0355a4b2364350aaa24
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.1.1 b/metadata/md5-cache/dev-ruby/websocket-1.1.1
index 0384f7831d7e..f0c346217a65 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.1.1
+++ b/metadata/md5-cache/dev-ruby/websocket-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/websocket-1.1.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06266fa86d8fa5ae7875232907655f18
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.3.4 b/metadata/md5-cache/dev-ruby/websocket-driver-0.3.4
index 499c7f0ff1da..4e2cedf653e0 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.3.4
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.3.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/websocket-driver-0.3.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b0fc1df3edff4d26c7063edabf078c8
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.2 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.2
index d4fc6100c4f9..929cc14eaaa4 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.2
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.2.tar.gz -> websocket-driver-0.6.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6a764f0f448e24217325b9789020d23d
diff --git a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.3 b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.3
index 3bcc5a08eba3..e0884b40cd79 100644
--- a/metadata/md5-cache/dev-ruby/websocket-driver-0.6.3
+++ b/metadata/md5-cache/dev-ruby/websocket-driver-0.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/websocket-extensions-0.1.0[ruby_target
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-driver-ruby/archive/0.6.3.tar.gz -> websocket-driver-0.6.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9171a78015b853186e8971aeb007223d
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
index a5a7060e2155..0e083a8fe041 100644
--- a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.2.tar.gz -> websocket-extensions-0.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0eafdf6d0eb9c5d9307c22645cde7084
diff --git a/metadata/md5-cache/dev-ruby/wikicloth-0.8.1 b/metadata/md5-cache/dev-ruby/wikicloth-0.8.1
index 5119cdb1449f..df397f9d479b 100644
--- a/metadata/md5-cache/dev-ruby/wikicloth-0.8.1
+++ b/metadata/md5-cache/dev-ruby/wikicloth-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder[ruby_targets_ruby19] dev-ruby/ex
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/wikicloth/archive/v0.8.1.tar.gz -> wikicloth-0.8.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3dacd94eea1ab0ea1caaf4f2c587a26a
diff --git a/metadata/md5-cache/dev-ruby/wikicloth-0.8.2 b/metadata/md5-cache/dev-ruby/wikicloth-0.8.2
index a9e70c3e5c0d..b78f0c68b57e 100644
--- a/metadata/md5-cache/dev-ruby/wikicloth-0.8.2
+++ b/metadata/md5-cache/dev-ruby/wikicloth-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder[ruby_targets_ruby19] dev-ruby/ex
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/wikicloth/archive/v0.8.2.tar.gz -> wikicloth-0.8.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76082d0c46c04b1b80bd0863646a3499
diff --git a/metadata/md5-cache/dev-ruby/wikicloth-0.8.3 b/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
index 75615adca7f8..760dbe74c5ef 100644
--- a/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
+++ b/metadata/md5-cache/dev-ruby/wikicloth-0.8.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/builder:*[ruby_targets_ruby19] dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/nricciar/wikicloth/archive/v0.8.3.tar.gz -> wikicloth-0.8.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c08374ec3ff991fae655e06c1ec78a6
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.0.7 b/metadata/md5-cache/dev-ruby/will_paginate-3.0.7
index 472616fd9732..886179501dde 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.0.7
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.0.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53b239a492a892ca619f80e88764980a
diff --git a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0 b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
index 9f9e3535b6ad..2b3d3d2aee14 100644
--- a/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
+++ b/metadata/md5-cache/dev-ruby/will_paginate-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=3
 SRC_URI=mirror://rubygems/will_paginate-3.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=afa0372b4172c36d66b1c6c4f112e61e
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3
index 4fe2fe1896a0..54bb4edbcee2 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/wirble-0.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=81453a35e89dc6c1989df2eb63790bf3
diff --git a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4 b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
index f5c069f43a4c..43c39f204e51 100644
--- a/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
+++ b/metadata/md5-cache/dev-ruby/wirble-0.1.3-r4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/wirble-0.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=773630427317ce115889f4c1f2b7b53a
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.3 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.3
index 86ee0138ff51..ec5f07ea1daa 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.3
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/xml-simple-1.1.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62c61ebf9c93539fee9ea451e89f896a
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.4 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.4
index 5244e9352758..e4e6beff00af 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.4
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/xml-simple-1.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f27ade63bfc7159835a1013bcc9cfee5
diff --git a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5 b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
index 8767214193b7..5b937f145562 100644
--- a/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
+++ b/metadata/md5-cache/dev-ruby/xml-simple-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/maik/xml-simple/archive/v1.1.5.tar.gz -> xml-simple-1.1.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53cedd6082dad7141384f823552c1c60
diff --git a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1 b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
index 84f084365c59..6b475aef1eab 100644
--- a/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-0.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/xpath-0.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d13161f2fb0f64333604a3fca92442aa
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1 b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
index 46310490afdc..9f7558df43f6 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=2
 SRC_URI=mirror://rubygems/xpath-2.0.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc9900100488de0c06e9b5c817e5b27f
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
index 0939c43daf6c..cf70aec3f449 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.1.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7d07e61b44ac00c7b633361606b4018
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0
index 9f99c2f0ccdb..23c9cee1f122 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e80716b2e8c1df2756d46d6b0754fea
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
index f7d87a48569b..14fc22a31660 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/yajl ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.2.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56e098988593b79a5658da66855506eb
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.3 b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
index 29f158bc2e30..6b85a904e26f 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.3
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/0.8.7.3.tar.gz -> yard-0.8.7.3-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ecc885dbe4d6d9a56527302de495943
diff --git a/metadata/md5-cache/dev-ruby/yard-0.8.7.6 b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
index 75044039bdea..04105911529a 100644
--- a/metadata/md5-cache/dev-ruby/yard-0.8.7.6
+++ b/metadata/md5-cache/dev-ruby/yard-0.8.7.6
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/lsegal/yard/archive/v0.8.7.6.tar.gz -> yard-0.8.7.6-git.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e88c650e04cf72d5dab1ae6c7452e37
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.0 b/metadata/md5-cache/dev-ruby/zentest-4.11.0
index 5a8777e680b7..105c275f7b86 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.11.0
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/ZenTest-4.11.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=214926e92146a69570d8ff0da4070c62
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.9.5 b/metadata/md5-cache/dev-ruby/zentest-4.9.5
index 3d06d150ae4c..2ad6674af4d6 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.9.5
+++ b/metadata/md5-cache/dev-ruby/zentest-4.9.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/ZenTest-4.9.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1d5085bdb210d2ec76376b8d90b6da1f
diff --git a/metadata/md5-cache/dev-scheme/jscheme-7.2 b/metadata/md5-cache/dev-scheme/jscheme-7.2
index 088b4310c296..7cc2ed852d8e 100644
--- a/metadata/md5-cache/dev-scheme/jscheme-7.2
+++ b/metadata/md5-cache/dev-scheme/jscheme-7.2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jscheme/jscheme-7.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e746a1e2217929ef6880b549083cc6d
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.10 b/metadata/md5-cache/dev-scheme/kawa-1.10
index 101e7295c14a..bd671f2205a3 100644
--- a/metadata/md5-cache/dev-scheme/kawa-1.10
+++ b/metadata/md5-cache/dev-scheme/kawa-1.10
@@ -9,5 +9,5 @@ LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
 RDEPEND=( >=virtual/jdk-1.5 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( dev-java/servletapi:2.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/kawa/kawa-1.10.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_2.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3303e62601dbe2cdee6581921724477
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.14 b/metadata/md5-cache/dev-scheme/kawa-1.14
index c3810df87ed4..6b09aba5f1c5 100644
--- a/metadata/md5-cache/dev-scheme/kawa-1.14
+++ b/metadata/md5-cache/dev-scheme/kawa-1.14
@@ -9,5 +9,5 @@ LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
 RDEPEND=( >=virtual/jdk-1.6 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( java-virtuals/servlet-api:3.0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://gnu/kawa/kawa-1.14.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_3.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61ff053c67986bee963e92833f30de21
diff --git a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1 b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
index 1070526273f1..45376f76d211 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-java/pdfbox:1.8 dev-java/fontbox:1.7 virtual/perl-Getopt-Long dev-perl/File-Which >=virtual/jre-1.6 !<=dev-texlive/texlive-latexextra-2010 virtual/latex-base >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/pdfannotextractor-0.1l.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	latex-package	343898697e1130e0665632129e623648	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	latex-package	343898697e1130e0665632129e623648	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef01ba4725bb4996195d4dcead3622a6
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r1 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r1
index 7d503b84e608..6d71e5e2ba45 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r1
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r1
@@ -9,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	latex-package	343898697e1130e0665632129e623648	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	latex-package	343898697e1130e0665632129e623648	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9ef96609d2b99b9d071b89cc006d9072
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2
index c48a3d8a7eef..ddc5c3599f30 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r2
@@ -9,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	latex-package	343898697e1130e0665632129e623648	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	latex-package	343898697e1130e0665632129e623648	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa6de0d8378edd3257cfc831302aa59c
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3
index e5dd427b4aa5..6b868059e170 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r3
@@ -9,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	latex-package	343898697e1130e0665632129e623648	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	latex-package	343898697e1130e0665632129e623648	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1139f85960e03b52c5499f5399afde7
diff --git a/metadata/md5-cache/dev-util/anjuta-3.18.2 b/metadata/md5-cache/dev-util/anjuta-3.18.2
index 1477ccf05c35..897d3714500e 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.18.2
+++ b/metadata/md5-cache/dev-util/anjuta-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=A versatile IDE for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Anjuta
 IUSE=debug devhelp glade +introspection packagekit subversion terminal test vala python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender >=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(+)] devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) subversion? ( >=dev-vcs/subversion-1.8:= >=net-libs/serf-1.2:1= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) terminal? ( >=x11-libs/vte-0.27.6:2.91 ) vala? ( || ( dev-lang/vala:0.28 ) ) gnome-base/gsettings-desktop-schemas packagekit? ( app-admin/packagekit-base )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.18/anjuta-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=264b6488b5768c825b0b83c525c86fd6
+_md5_=a44e58201f4d1b32c102a0b4a1814379
diff --git a/metadata/md5-cache/dev-util/antlrworks-1.2.3 b/metadata/md5-cache/dev-util/antlrworks-1.2.3
index 83a2cd3c9e07..ae140e151fdb 100644
--- a/metadata/md5-cache/dev-util/antlrworks-1.2.3
+++ b/metadata/md5-cache/dev-util/antlrworks-1.2.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.5 dev-java/stringtemplate:0 dev-java/antlr:0 >=dev-java/antlr-3.1.3:3 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.antlr.org/download/antlrworks-1.2.3-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3048ad3d35f83105efca2ea711011f4e
diff --git a/metadata/md5-cache/dev-util/argouml-0.34 b/metadata/md5-cache/dev-util/argouml-0.34
index d6c249baea03..acbba1eee178 100644
--- a/metadata/md5-cache/dev-util/argouml-0.34
+++ b/metadata/md5-cache/dev-util/argouml-0.34
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://argouml-downloads.tigris.org/nonav/argouml-0.34/ArgoUML-0.34.tar.gz http://argouml-downloads.tigris.org/nonav/argouml-db-1.0/dbuml-module-1.0.4.zip doc? ( http://argouml-downloads.tigris.org/nonav/argouml-0.34/manual-0.34.pdf http://argouml-downloads.tigris.org/nonav/argouml-0.34/quickguide-0.34.pdf )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fe6f4f1f4b326297fcc28222c1853cc
diff --git a/metadata/md5-cache/dev-util/aruba-0.5.4-r1 b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
index 100c192728af..0c595ae9649c 100644
--- a/metadata/md5-cache/dev-util/aruba-0.5.4-r1
+++ b/metadata/md5-cache/dev-util/aruba-0.5.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.5.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f49430fc0c7a160a13a7b43ba108f05d
diff --git a/metadata/md5-cache/dev-util/aruba-0.6.2 b/metadata/md5-cache/dev-util/aruba-0.6.2
index 7db616def164..7e8cf03ad889 100644
--- a/metadata/md5-cache/dev-util/aruba-0.6.2
+++ b/metadata/md5-cache/dev-util/aruba-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.6.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd8563e99aa785f7e82a57d80e7ddb7c
diff --git a/metadata/md5-cache/dev-util/aruba-0.7.4 b/metadata/md5-cache/dev-util/aruba-0.7.4
index e3bb1a8ca605..d64beff9e132 100644
--- a/metadata/md5-cache/dev-util/aruba-0.7.4
+++ b/metadata/md5-cache/dev-util/aruba-0.7.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.3.6[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.7.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6495e3736b9bdded4cb2ce31e7c5f48
diff --git a/metadata/md5-cache/dev-util/aruba-0.8.1 b/metadata/md5-cache/dev-util/aruba-0.8.1
index 9c90f75daff4..5621005a7311 100644
--- a/metadata/md5-cache/dev-util/aruba-0.8.1
+++ b/metadata/md5-cache/dev-util/aruba-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.5.6[ruby_targets_ruby19
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/aruba-0.8.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e640066a07ea193aa77d640a7a7d8f71
diff --git a/metadata/md5-cache/dev-util/astyle-2.02.1 b/metadata/md5-cache/dev-util/astyle-2.02.1
index 93ed9d18852b..657244d359d8 100644
--- a/metadata/md5-cache/dev-util/astyle-2.02.1
+++ b/metadata/md5-cache/dev-util/astyle-2.02.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astyle/astyle_2.02.1_linux.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=589e154dae3cfe4d7bf2a17a01e0a243
diff --git a/metadata/md5-cache/dev-util/astyle-2.03 b/metadata/md5-cache/dev-util/astyle-2.03
index 9ff803a0eaf8..e2a3b96ebd81 100644
--- a/metadata/md5-cache/dev-util/astyle-2.03
+++ b/metadata/md5-cache/dev-util/astyle-2.03
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astyle/astyle_2.03_linux.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1faf60177e8bf8baa15090eaf6c661b5
diff --git a/metadata/md5-cache/dev-util/astyle-2.04-r1 b/metadata/md5-cache/dev-util/astyle-2.04-r1
index 9cca42d614c6..dddeca06bc0b 100644
--- a/metadata/md5-cache/dev-util/astyle-2.04-r1
+++ b/metadata/md5-cache/dev-util/astyle-2.04-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astyle/astyle_2.04_linux.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4711f608f6498112fdc4703b12299709
diff --git a/metadata/md5-cache/dev-util/astyle-2.05.1 b/metadata/md5-cache/dev-util/astyle-2.05.1
index ca8e32a4ebe0..b7eb7a99d3f6 100644
--- a/metadata/md5-cache/dev-util/astyle-2.05.1
+++ b/metadata/md5-cache/dev-util/astyle-2.05.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-arch/xz-utils java? ( >=virtual/jdk-1.6:= ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/astyle/astyle_2.05.1_linux.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ca8bf95c4247bf4ec45b22d0a44c73e
diff --git a/metadata/md5-cache/dev-util/bluej-3.1.1 b/metadata/md5-cache/dev-util/bluej-3.1.1
index 8545d0d22daa..8b6274e32d79 100644
--- a/metadata/md5-cache/dev-util/bluej-3.1.1
+++ b/metadata/md5-cache/dev-util/bluej-3.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.bluej.org/download/files/source/BlueJ-source-311.zip doc? ( http://bluej.org/download/files/bluej-ref-manual.pdf http://bluej.org/tutorial/tutorial-201.pdf -> bluej-tutorial-2.0.1.pdf http://bluej.org/tutorial/testing-tutorial.pdf -> bluej-testing-tutorial.pdf )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=420e5b058d82a6b33676e30b6856f815
diff --git a/metadata/md5-cache/dev-util/checkstyle-5.5-r1 b/metadata/md5-cache/dev-util/checkstyle-5.5-r1
index 6826ee5f2277..1697bef6e2ed 100644
--- a/metadata/md5-cache/dev-util/checkstyle-5.5-r1
+++ b/metadata/md5-cache/dev-util/checkstyle-5.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:18 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/checkstyle/checkstyle-5.5-src.tar.gz https://dev.gentoo.org/~sera/distfiles/checkstyle-5.4-maven-build.xml.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7989977db9430bbfba3bb92cda2a102c
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a b/metadata/md5-cache/dev-util/cscope-15.8a
index 31266b7dfd7f..a9924c7005b8 100644
--- a/metadata/md5-cache/dev-util/cscope-15.8a
+++ b/metadata/md5-cache/dev-util/cscope-15.8a
@@ -4,10 +4,10 @@ DESCRIPTION=Interactively examine a C program
 EAPI=4
 HOMEPAGE=http://cscope.sourceforge.net/
 IUSE=emacs
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2 emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=e6f0c445bc01c1763dabcd1d0393a23c
+_md5_=3471229913aa7b304a5e9598146a2591
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.17 b/metadata/md5-cache/dev-util/cucumber-1.3.17
index f9d919716d39..777e91894d62 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.17
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.17
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.17.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fd2d69e453d0cd7d6c4941848f2654f
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.18 b/metadata/md5-cache/dev-util/cucumber-1.3.18
index 7bc42503edb6..edac8706d4ca 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.18
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.18
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.18.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b492f3bdfc36518df00eac1edf722110
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.19 b/metadata/md5-cache/dev-util/cucumber-1.3.19
index 0b8b5b26dc3b..b5974f599c13 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.19
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.19
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.19.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6aa96539c5f9d20c5ec692116bb3077b
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.20 b/metadata/md5-cache/dev-util/cucumber-1.3.20
index 7f526343e897..c4726cad7af4 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.20
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.20
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.20.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=040524fb40c6e058fe4332995cf30cc7
diff --git a/metadata/md5-cache/dev-util/cucumber-1.3.20-r1 b/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
index 3830563f2eda..b243dcaf4dc1 100644
--- a/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
+++ b/metadata/md5-cache/dev-util/cucumber-1.3.20-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/builder-2.1.2:*[ruby_targets_ruby19] >
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-1.3.20.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae1230921ef0e5fabb4d0aae1b9315ae
diff --git a/metadata/md5-cache/dev-util/cucumber-core-1.2.0 b/metadata/md5-cache/dev-util/cucumber-core-1.2.0
index b0af51846fca..dba118c4fe14 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-1.2.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/gherkin-2.12.0:0[ruby_targets_ruby19]
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-core-1.2.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8641f2ab0fbeb46b91035861362b8d33
diff --git a/metadata/md5-cache/dev-util/cucumber-core-1.3.0 b/metadata/md5-cache/dev-util/cucumber-core-1.3.0
index 1f0225daca23..f20e974f84f1 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-1.3.0
+++ b/metadata/md5-cache/dev-util/cucumber-core-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/gherkin3-3.1.0:3[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-core-1.3.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a87547701378dd11067adde70c1ca090
diff --git a/metadata/md5-cache/dev-util/cucumber-core-1.3.1 b/metadata/md5-cache/dev-util/cucumber-core-1.3.1
index 306aaa827808..e14d9a181c3d 100644
--- a/metadata/md5-cache/dev-util/cucumber-core-1.3.1
+++ b/metadata/md5-cache/dev-util/cucumber-core-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/gherkin3-3.1.0:3[ruby_targets_ruby20]
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/cucumber-core-1.3.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a87547701378dd11067adde70c1ca090
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.4.1 b/metadata/md5-cache/dev-util/cucumber-rails-1.4.1
index 87a34f468f47..40a538b94bc0 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.4.1
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.4.1.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=51439fb99445c24fba4436a91c868f07
diff --git a/metadata/md5-cache/dev-util/cucumber-rails-1.4.2 b/metadata/md5-cache/dev-util/cucumber-rails-1.4.2
index 515f347ca811..f84bfb2dd0ae 100644
--- a/metadata/md5-cache/dev-util/cucumber-rails-1.4.2
+++ b/metadata/md5-cache/dev-util/cucumber-rails-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://rubygems/cucumber-rails-1.4.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=403d759393c8039618de8abb72b75731
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.78 b/metadata/md5-cache/dev-util/debootstrap-1.0.78-r1
similarity index 92%
rename from metadata/md5-cache/dev-util/debootstrap-1.0.78
rename to metadata/md5-cache/dev-util/debootstrap-1.0.78-r1
index 8ac3b6ef668f..b8e92ff232c3 100644
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.78
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.78-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Debian/Ubuntu bootstrap scripts
-EAPI=5
+EAPI=6
 HOMEPAGE=http://packages.qa.debian.org/d/debootstrap.html
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
@@ -8,4 +8,4 @@ RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.78.tar.gz mirror://gentoo/devices.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=1c104641fcfdca612e4f2c836557e9a2
+_md5_=368122aa13f6c982b7f4f37e012865f4
diff --git a/metadata/md5-cache/dev-util/deskzilla-1.7.1-r1 b/metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
index b0ae9fe91e18..a1131e052aca 100644
--- a/metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
+++ b/metadata/md5-cache/dev-util/deskzilla-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/picocontainer:1 dev-java/javolution:4 >=dev-j
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://d1.almworks.com/.files/deskzilla-1_7_1_without_jre.tar.gz https://dev.gentoo.org/~ercpe/distfiles/dev-util/deskzilla/deskzilla_gentoo.license
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8938415fa44a6b69bafc55a5b361058f
diff --git a/metadata/md5-cache/dev-util/devhelp-3.18.1 b/metadata/md5-cache/dev-util/devhelp-3.18.1
index 54c287ea08d9..effc5c232278 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.18.1
+++ b/metadata/md5-cache/dev-util/devhelp-3.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=An API documentation browser for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
 IUSE=gedit python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.13.4:3 >=net-libs/webkit-gtk-2.6.0:4 gedit? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-editors/gedit[introspection,python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] x11-libs/gtk+[introspection] ) gnome-base/gsettings-desktop-schemas
 REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0/3-1
 SRC_URI=mirror://gnome/sources/devhelp/3.18/devhelp-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=70b7b52c9a7e92c20efb764201b3f975
+_md5_=cc60e476d1f8a598aa553b864ed8a84e
diff --git a/metadata/md5-cache/dev-util/findbugs-3.0.1 b/metadata/md5-cache/dev-util/findbugs-3.0.1
index eaa0b3fae791..2e63d5db77de 100644
--- a/metadata/md5-cache/dev-util/findbugs-3.0.1
+++ b/metadata/md5-cache/dev-util/findbugs-3.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.7 dev-java/ant-core:0 dev-java/apple-java-extensions-bin:0 >=dev-java/asm-5:4 >=dev-java/bcel-6:0 dev-java/commons-lang:2.1 dev-java/dom4j:1 dev-java/hamcrest-core:1.3 dev-java/jaxen:1.1 dev-java/jcip-annotations:0 dev-java/jdepend:0 >=dev-java/jformatstring-2.0.3:0 dev-java/jsr305:0 dev-java/junit:4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f579969398f85768dda44f570e539e3f
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.46.2 b/metadata/md5-cache/dev-util/gdbus-codegen-2.46.2
index 2bcc9c427b3f..65ce741857be 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.46.2
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.46.2
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.46.2:2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.46/glib-2.46.2.tar.xz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=690438c6c149f238a27aa20d1a87b242
+_md5_=090cf06fc0577198d737c743ffd149cb
diff --git a/metadata/md5-cache/dev-util/gnome-devel-docs-3.18.1 b/metadata/md5-cache/dev-util/gnome-devel-docs-3.18.1
index 78675c6c3da6..4b78d51a8854 100644
--- a/metadata/md5-cache/dev-util/gnome-devel-docs-3.18.1
+++ b/metadata/md5-cache/dev-util/gnome-devel-docs-3.18.1
@@ -3,10 +3,10 @@ DEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 dev-libs/libx
 DESCRIPTION=Documentation for developing for the GNOME desktop environment
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-devel-docs/3.18/gnome-devel-docs-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=14c9d29a04c657ebd84a7c1b23b96be1
+_md5_=e86f107698642f2c7652fb76d11088d5
diff --git a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.29 b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.29
index 0ae419132565..8e3d743bb866 100644
--- a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.29
+++ b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.29
@@ -4,11 +4,11 @@ DESCRIPTION=Converts Glade files to GtkBuilder XML format
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=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(+)] !<=x11-libs/gtk+-2.24.10:2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.29.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5c6a448e15a05fc0145df2068434b2e0
+_md5_=fcf45d6b8ec7d39e5778f5e2439e7ded
diff --git a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.18.4 b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.18.4
index 0738c1077f4a..a50d7994b8ff 100644
--- a/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.18.4
+++ b/metadata/md5-cache/dev-util/gtk-update-icon-cache-3.18.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.2
 DESCRIPTION=GTK update icon cache
 EAPI=5
 HOMEPAGE=http://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gdk-pixbuf-2.30:2 !<x11-libs/gtk+-2.24.28-r1:2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~eva/distfiles/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7eea83778b345b2e3e64306abe411919
+_md5_=c188441952a9e6db39e780695f1db3b4
diff --git a/metadata/md5-cache/dev-util/jarwizard-2.50 b/metadata/md5-cache/dev-util/jarwizard-2.50
index b5bccfc63461..7ef2a0fa466d 100644
--- a/metadata/md5-cache/dev-util/jarwizard-2.50
+++ b/metadata/md5-cache/dev-util/jarwizard-2.50
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jarwizard/jarwizard_250_src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dbf8dc0256324a8820f9a9352bc0478
diff --git a/metadata/md5-cache/dev-util/jay-1.1.1-r2 b/metadata/md5-cache/dev-util/jay-1.1.1-r2
index d0410d2602bd..6eb3b1b1868c 100644
--- a/metadata/md5-cache/dev-util/jay-1.1.1-r2
+++ b/metadata/md5-cache/dev-util/jay-1.1.1-r2
@@ -10,5 +10,5 @@ RDEPEND=java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cs.rit.edu/~ats/projects/lp/doc/jay/doc-files/src.zip -> jay-1.1.1.zip https://dev.gentoo.org/~ssuominen/jay-1.1.1-mono.snk.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1089d71b469e54225f3a638215b03f7
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8-r3 b/metadata/md5-cache/dev-util/jconfig-2.8-r3
index a79a5537cd7e..d4df85f4fdfa 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8-r3
+++ b/metadata/md5-cache/dev-util/jconfig-2.8-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31a49bb676cee521f52539a558c97f92
diff --git a/metadata/md5-cache/dev-util/jconfig-2.8.5 b/metadata/md5-cache/dev-util/jconfig-2.8.5
index 21d9286ca261..7b7cd958a25a 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.8.5
+++ b/metadata/md5-cache/dev-util/jconfig-2.8.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.4 java-virtuals/jmx >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.8.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=31a49bb676cee521f52539a558c97f92
diff --git a/metadata/md5-cache/dev-util/jconfig-2.9 b/metadata/md5-cache/dev-util/jconfig-2.9
index e1a95012cb88..4194fbc8d520 100644
--- a/metadata/md5-cache/dev-util/jconfig-2.9
+++ b/metadata/md5-cache/dev-util/jconfig-2.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 java-virtuals/jmx >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jconfig/jconfig-src-v2.9.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9988eb648a8e4e92458344c6989f9a60
diff --git a/metadata/md5-cache/dev-util/jif-3.1_rc1 b/metadata/md5-cache/dev-util/jif-3.1_rc1
index 8fa35c133e23..b74156423b9a 100644
--- a/metadata/md5-cache/dev-util/jif-3.1_rc1
+++ b/metadata/md5-cache/dev-util/jif-3.1_rc1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-lang/inform-6.21.4 >=games-engines/gargoyle-2010.1 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.slade.altervista.org/downloads/JIF31_src_RC1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=406c62936ed2d1b8d9f40e2ee7000e61
diff --git a/metadata/md5-cache/dev-util/mdds-1.1.0 b/metadata/md5-cache/dev-util/mdds-1.1.0
new file mode 100644
index 000000000000..de772608a90f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mdds-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure prepare test
+DEPEND=dev-libs/boost:= doc? ( app-doc/doxygen dev-python/sphinx )
+DESCRIPTION=A collection of multi-dimensional data structure and indexing algorithm
+EAPI=6
+HOMEPAGE=https://gitlab.com/mdds/mdds
+IUSE=doc valgrind
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/boost:=
+SLOT=1/1.1.0
+SRC_URI=http://kohei.us/files/mdds/src/mdds-1.1.0.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=85492a548f8806ae4f1d00324201fcdf
diff --git a/metadata/md5-cache/dev-util/mdds-9999 b/metadata/md5-cache/dev-util/mdds-9999
index 8f937be08663..b530746d325d 100644
--- a/metadata/md5-cache/dev-util/mdds-9999
+++ b/metadata/md5-cache/dev-util/mdds-9999
@@ -1,10 +1,11 @@
 DEFINED_PHASES=compile configure prepare test unpack
-DEPEND=dev-libs/boost:= >=dev-vcs/git-1.8.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
+DEPEND=dev-libs/boost:= doc? ( app-doc/doxygen dev-python/sphinx ) >=dev-vcs/git-1.8.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
 DESCRIPTION=A collection of multi-dimensional data structure and indexing algorithm
-EAPI=5
+EAPI=6
 HOMEPAGE=https://gitlab.com/mdds/mdds
+IUSE=doc valgrind
 LICENSE=MIT
 RDEPEND=dev-libs/boost:=
-SLOT=0/9999
+SLOT=1/9999
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b2f714cf7730fda63b7c932660ec9f9e
+_md5_=85492a548f8806ae4f1d00324201fcdf
diff --git a/metadata/md5-cache/dev-util/meld-3.14.2 b/metadata/md5-cache/dev-util/meld-3.14.2
index 269c85fee98f..9c9b48df9d43 100644
--- a/metadata/md5-cache/dev-util/meld-3.14.2
+++ b/metadata/md5-cache/dev-util/meld-3.14.2
@@ -4,11 +4,11 @@ DESCRIPTION=A graphical diff and merge tool
 EAPI=5
 HOMEPAGE=http://meldmerge.org/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=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-libs/glib-2.36:2[dbus] dev-python/dbus-python[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/pygobject-3.8:3[cairo,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(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.12:3[introspection] >=x11-libs/gtksourceview-3.10:3.0[introspection] x11-themes/hicolor-icon-theme >=dev-lang/python-2.7.5-r2:2.7[xml] >=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(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/meld/3.14/meld-3.14.2.tar.xz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=85c8617c6644ac9e6216a2a7bac214ae
+_md5_=21a3f3fa092550397462a6034278e486
diff --git a/metadata/md5-cache/dev-util/netbeans-8.0.2 b/metadata/md5-cache/dev-util/netbeans-8.0.2
index 423ccf9c341c..8729c8f69b5e 100644
--- a/metadata/md5-cache/dev-util/netbeans-8.0.2
+++ b/metadata/md5-cache/dev-util/netbeans-8.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-harness-8.0.2 ~dev-java/netbeans-ide-8.0.2 ~dev-java/netbeans-nb-8.0.2 ~dev-java/netbeans-platform-8.0.2 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-8.0.2 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-8.0.2 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-8.0.2 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-8.0.2 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-8.0.2 ) netbeans_modules_extide? ( ~dev-java/netbeans-extide-8.0.2 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-8.0.2 ) netbeans_modules_java? ( ~dev-java/netbeans-java-8.0.2 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-8.0.2 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-8.0.2 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-8.0.2 ) netbeans_modules_php? ( ~dev-java/netbeans-php-8.0.2 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-8.0.2 ) netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-8.0.2 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-8.0.2 ) doc? ( ~dev-java/netbeans-javadoc-8.0.2 ) >=dev-java/java-config-2.2.0
 SLOT=8.0
 SRC_URI=linguas_af? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ar? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_bg? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ca? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_cs? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_de? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_el? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_es? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_fr? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_gl? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_hi_IN? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_id? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_it? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ja? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ko? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_lt? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_nl? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_pl? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_pt_BR? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_pt_PT? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ro? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ru? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_si? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_sq? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_sr? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_sv? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_ta_IN? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_tl? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_tr? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_vi? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_zh_CN? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 ) linguas_zh_TW? ( http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2 https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.0.1-20141110.tar.bz2 )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47b2d913f698a6527f845039f950e0d1
diff --git a/metadata/md5-cache/dev-util/netbeans-8.1 b/metadata/md5-cache/dev-util/netbeans-8.1
index c43fc369c162..114190232621 100644
--- a/metadata/md5-cache/dev-util/netbeans-8.1
+++ b/metadata/md5-cache/dev-util/netbeans-8.1
@@ -9,5 +9,5 @@ LICENSE=|| ( CDDL GPL-2-with-linking-exception )
 RDEPEND=>=virtual/jdk-1.7 ~dev-java/netbeans-harness-8.1 ~dev-java/netbeans-ide-8.1 ~dev-java/netbeans-nb-8.1 ~dev-java/netbeans-platform-8.1 netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-8.1 ) netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-8.1 ) netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-8.1 ) netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-8.1 ) netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-8.1 ) netbeans_modules_extide? ( ~dev-java/netbeans-extide-8.1 ) netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-8.1 ) netbeans_modules_java? ( ~dev-java/netbeans-java-8.1 ) netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-8.1 ) netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-8.1 ) netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-8.1 ) netbeans_modules_php? ( ~dev-java/netbeans-php-8.1 ) netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-8.1 ) netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-8.1 ) netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-8.1 ) doc? ( ~dev-java/netbeans-javadoc-8.1 ) >=dev-java/java-config-2.2.0
 SLOT=8.1
 SRC_URI=linguas_af? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_ar? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_ar_SA? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_bg? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_ca? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_cs? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_de? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_el? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_es? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_es_CO? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_fil? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_fr? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_gl? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_hi_IN? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_id_ID? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_it? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_ja? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_ko? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_lt? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_nl_BE? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_nl_NL? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_pl? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_pt_BR? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_pt_PT? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_ro? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_ru? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_si? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_sq? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_sr? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_sv? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_ta_IN? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_tr? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_vi? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_zh_CN? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 ) linguas_zh_TW? ( http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2 http://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-8.1-20151105.tar.bz2 )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=69dfdc7a875e5e684f250751c021f2d2
diff --git a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1 b/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
index 768f51824f8f..a4af1fd1b208 100644
--- a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
+++ b/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 >=sys-devel/binutils-2.14.90.0.6-r3:* >=sys-libs/glibc-2.3.2-r1 qt4? ( dev-qt/qtgui:4[qt3support] ) java? ( >=virtual/jdk-1.5:= ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.9.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=22361e14000f7a43acff76ed56f3c53a
diff --git a/metadata/md5-cache/dev-util/oprofile-0.9.9-r2 b/metadata/md5-cache/dev-util/oprofile-0.9.9-r2
index 9c1e806983df..ccd239302d5f 100644
--- a/metadata/md5-cache/dev-util/oprofile-0.9.9-r2
+++ b/metadata/md5-cache/dev-util/oprofile-0.9.9-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs >=sys-libs/glibc-2.3.2-r1 qt4? ( dev-qt/qtgui:4[qt3support] ) java? ( >=virtual/jdk-1.5:= ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.9.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9d7ae91f95cd8989badf72c1377ea2a
diff --git a/metadata/md5-cache/dev-util/oprofile-1.0.0-r2 b/metadata/md5-cache/dev-util/oprofile-1.0.0-r2
index d0c3a7c3edb4..7c8b106e5e3d 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.0.0-r2
+++ b/metadata/md5-cache/dev-util/oprofile-1.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.0.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d4a511c4669ec94cfc37c2beda1abbd5
diff --git a/metadata/md5-cache/dev-util/oprofile-1.1.0-r1 b/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
index a4ea372610bc..3eac7b72a895 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
+++ b/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs >=sys-libs/glibc-2.3.2-r1 java? ( >=virtual/jdk-1.5:= ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eea381b4b83a4b115fcf7cf7869d97d2
diff --git a/metadata/md5-cache/dev-util/pmd-4.2.5 b/metadata/md5-cache/dev-util/pmd-4.2.5
index 85a9197783e2..d3cb79639b4f 100644
--- a/metadata/md5-cache/dev-util/pmd-4.2.5
+++ b/metadata/md5-cache/dev-util/pmd-4.2.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.5 dev-java/ant-core dev-java/asm:3 dev-java/jaxen:1.1 >=
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pmd/pmd-src-4.2.5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=43876ebac90ce26ee90a4cfa2d24f56b
diff --git a/metadata/md5-cache/dev-util/scala-ide-4.1.0 b/metadata/md5-cache/dev-util/scala-ide-4.1.0
index 4d997a55e6a3..d66e94ebe505 100644
--- a/metadata/md5-cache/dev-util/scala-ide-4.1.0
+++ b/metadata/md5-cache/dev-util/scala-ide-4.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jre-1.6 java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=amd64? ( http://downloads.typesafe.com/scalaide-pack/4.1.0-vfinal-luna-211-20150525/scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86_64.tar.gz ) x86? ( http://downloads.typesafe.com/scalaide-pack/4.1.0-vfinal-luna-211-20150525/scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8047c58ebbb5708c42f6bb592f4c5fde
diff --git a/metadata/md5-cache/dev-util/scala-ide-4.3.0 b/metadata/md5-cache/dev-util/scala-ide-4.3.0
index 3d090f8bcec7..d53a17dfd229 100644
--- a/metadata/md5-cache/dev-util/scala-ide-4.3.0
+++ b/metadata/md5-cache/dev-util/scala-ide-4.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/jdk-1.6 || ( dev-lang/scala dev-lang/scala-bin ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=amd64? ( http://downloads.typesafe.com/scalaide-pack/4.3.0-vfinal-luna-211-20151201/scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86_64.tar.gz ) x86? ( http://downloads.typesafe.com/scalaide-pack/4.3.0-vfinal-luna-211-20151201/scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b9484b38d77ab2a3588aa0bdb1795a9
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.8-r1 b/metadata/md5-cache/dev-util/visualvm-1.3.8-r1
index 52e9f48ffac4..20f631397d00 100644
--- a/metadata/md5-cache/dev-util/visualvm-1.3.8-r1
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-linking-exception
 RDEPEND=|| ( virtual/jdk:1.7 virtual/jdk:1.8 ) dev-java/netbeans-platform:8.0 dev-java/netbeans-profiler:8.0 >=dev-java/java-config-2.2.0
 SLOT=7
 SRC_URI=https://java.net/downloads/visualvm/release138/visualvm_138-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7a5ad9374a8930959ac8eb83034e5c3f
diff --git a/metadata/md5-cache/dev-util/watchr-0.7 b/metadata/md5-cache/dev-util/watchr-0.7
index 7e2dbd8ae95e..1963fe7833f2 100644
--- a/metadata/md5-cache/dev-util/watchr-0.7
+++ b/metadata/md5-cache/dev-util/watchr-0.7
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/rev[ruby_targets_ruby19] ) ruby_targets_
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/watchr-0.7.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=502663f9596ca8419aa923cb91651f89
diff --git a/metadata/md5-cache/dev-util/weka-3.6.12-r1 b/metadata/md5-cache/dev-util/weka-3.6.12-r1
index 3a97e45d1bcb..b2d9539d4a34 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.12-r1
+++ b/metadata/md5-cache/dev-util/weka-3.6.12-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/javacup-0.11a_beta20060608:0 svm? ( sci-libs/libsvm:0[java] ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-6-12.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=67712e630c6ceb8d68592087a2de820c
diff --git a/metadata/md5-cache/dev-util/weka-3.6.6-r1 b/metadata/md5-cache/dev-util/weka-3.6.6-r1
index 0e0814d9dbc0..43c64a506a6a 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.6-r1
+++ b/metadata/md5-cache/dev-util/weka-3.6.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-6-6.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cb5412f5e9450fe9640f7c68baae1bcc
diff --git a/metadata/md5-cache/dev-util/weka-3.6.6-r2 b/metadata/md5-cache/dev-util/weka-3.6.6-r2
index 3ba4ae21329b..2121c4a21caf 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.6-r2
+++ b/metadata/md5-cache/dev-util/weka-3.6.6-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javacup-0.11a_beta20060608:0 svm? ( sci-libs/libsvm:0[java] ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-6-6.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fba80f2227b99cc5b2398d674d2d560d
diff --git a/metadata/md5-cache/dev-util/yuicompressor-2.4.8-r2 b/metadata/md5-cache/dev-util/yuicompressor-2.4.8-r2
index 5228ccdd7638..59a7330589c6 100644
--- a/metadata/md5-cache/dev-util/yuicompressor-2.4.8-r2
+++ b/metadata/md5-cache/dev-util/yuicompressor-2.4.8-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/jargs:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/yui/yuicompressor/archive/v2.4.8.tar.gz -> yuicompressor-2.4.8.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e97a005ce1956fbc97d1e939d9590cea
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.12.3 b/metadata/md5-cache/dev-vcs/bfg-1.12.3
index cbd190b5e5f3..7db2805ea905 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.12.3
+++ b/metadata/md5-cache/dev-vcs/bfg-1.12.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.12.3/bfg-1.12.3.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8e5eda4be3c0308d591679f723feb6c
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.12.4 b/metadata/md5-cache/dev-vcs/bfg-1.12.4
index 1855f1bd6c4a..2f140cbbed2a 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.12.4
+++ b/metadata/md5-cache/dev-vcs/bfg-1.12.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.12.4/bfg-1.12.4.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8e5eda4be3c0308d591679f723feb6c
diff --git a/metadata/md5-cache/dev-vcs/bfg-1.12.8 b/metadata/md5-cache/dev-vcs/bfg-1.12.8
index 049738fe0224..2c26feac32ca 100644
--- a/metadata/md5-cache/dev-vcs/bfg-1.12.8
+++ b/metadata/md5-cache/dev-vcs/bfg-1.12.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.12.8/bfg-1.12.8.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20b102e9e73bbcb8f7f45697c666e9e2
diff --git a/metadata/md5-cache/dev-vcs/git-2.7.1 b/metadata/md5-cache/dev-vcs/git-2.7.1
index c64a601d0592..65e33f017796 100644
--- a/metadata/md5-cache/dev-vcs/git-2.7.1
+++ b/metadata/md5-cache/dev-vcs/git-2.7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 SLOT=0
 SRC_URI=https://git-core.googlecode.com/files/git-2.7.1.tar.xz mirror://kernel/software/scm/git/git-2.7.1.tar.xz https://git-core.googlecode.com/files/git-manpages-2.7.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.7.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.7.1.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.7.1.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ad818ebe3b21bb39ff4b2656ea921557
+_md5_=1358581525b15d7f98f93ab47bd65d5b
diff --git a/metadata/md5-cache/dev-vcs/git-2.7.0-r2 b/metadata/md5-cache/dev-vcs/git-2.7.2
similarity index 88%
rename from metadata/md5-cache/dev-vcs/git-2.7.0-r2
rename to metadata/md5-cache/dev-vcs/git-2.7.2
index 16d08144f666..f04e2d74e9f5 100644
--- a/metadata/md5-cache/dev-vcs/git-2.7.0-r2
+++ b/metadata/md5-cache/dev-vcs/git-2.7.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[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/pygtksourceview-2.10.1-r1: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-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(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://git-core.googlecode.com/files/git-2.7.0.tar.xz mirror://kernel/software/scm/git/git-2.7.0.tar.xz https://git-core.googlecode.com/files/git-manpages-2.7.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.7.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.7.0.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.7.0.tar.xz )
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=2a93490313f24111aa9375255fa93e54
+SRC_URI=https://git-core.googlecode.com/files/git-2.7.2.tar.xz mirror://kernel/software/scm/git/git-2.7.2.tar.xz https://git-core.googlecode.com/files/git-manpages-2.7.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.7.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.7.2.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.7.2.tar.xz )
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=89038151c9309e0a94e353cae69dbda5
diff --git a/metadata/md5-cache/dev-vcs/gitg-3.18.0 b/metadata/md5-cache/dev-vcs/gitg-3.18.0
index dfd203d01c55..8537a63e8d34 100644
--- a/metadata/md5-cache/dev-vcs/gitg-3.18.0
+++ b/metadata/md5-cache/dev-vcs/gitg-3.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=git repository viewer for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
 IUSE=debug glade +python python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=app-crypt/libsecret dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= dev-libs/libgit2:=[threads] >=dev-libs/libgit2-glib-0.23.5[ssh] <dev-libs/libgit2-glib-0.24.0 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:4[introspection] >=x11-libs/gtk+-3.12.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( 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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 REQUIRED_USE=python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gitg/3.18/gitg-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=713175da0190e5085b147fcde30f59fe
+_md5_=7b58aa05f58f4d8060472a3a8c2f362c
diff --git a/metadata/md5-cache/dev-vcs/gitsh-0.10 b/metadata/md5-cache/dev-vcs/gitsh-0.10
index 91deba5fae27..03322b889463 100644
--- a/metadata/md5-cache/dev-vcs/gitsh-0.10
+++ b/metadata/md5-cache/dev-vcs/gitsh-0.10
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/bundler[ruby_targets_ruby19] dev-ruby/bl
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/gitsh/archive/v0.10.tar.gz -> gitsh-0.10.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b07d1287aff9576c8cea06650cbea4a5
diff --git a/metadata/md5-cache/dev-vcs/gitsh-0.8 b/metadata/md5-cache/dev-vcs/gitsh-0.8
index 7ccd568c8911..4e0114babf81 100644
--- a/metadata/md5-cache/dev-vcs/gitsh-0.8
+++ b/metadata/md5-cache/dev-vcs/gitsh-0.8
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/bundler[ruby_targets_ruby19] dev-ruby/bl
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/thoughtbot/gitsh/archive/v0.8.tar.gz -> gitsh-0.8.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=69bb4bb1a3aeed8edb5944e93b67c3a1
diff --git a/metadata/md5-cache/dev-vcs/hub-1.12.4 b/metadata/md5-cache/dev-vcs/hub-1.12.4
index bd1173a628e6..565d73d4d0f9 100644
--- a/metadata/md5-cache/dev-vcs/hub-1.12.4
+++ b/metadata/md5-cache/dev-vcs/hub-1.12.4
@@ -10,5 +10,5 @@ RDEPEND=dev-vcs/git ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/github/hub/archive/v1.12.4.tar.gz -> hub-1.12.4.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93b28dfad64c37aad0f5405c132b203d
diff --git a/metadata/md5-cache/dev-vcs/statcvs-0.5.0 b/metadata/md5-cache/dev-vcs/statcvs-0.5.0
index a37771753963..99d3aab5e985 100644
--- a/metadata/md5-cache/dev-vcs/statcvs-0.5.0
+++ b/metadata/md5-cache/dev-vcs/statcvs-0.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-vcs/cvs dev-java/jtreemap:0 dev-java/jcommon:1.0 >=dev-java/jfreechart-1.0.11:1.0 dev-java/jdom:1.0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/statcvs/statcvs-0.5.0-source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=727fc5e3e640ce0c12894eae54b6dee5
diff --git a/metadata/md5-cache/dev-vcs/statcvs-0.5.0-r1 b/metadata/md5-cache/dev-vcs/statcvs-0.5.0-r1
index fce4a179b66b..c44132478af8 100644
--- a/metadata/md5-cache/dev-vcs/statcvs-0.5.0-r1
+++ b/metadata/md5-cache/dev-vcs/statcvs-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-vcs/cvs dev-java/jtreemap:0 dev-java/jcommon:1.0 >=dev-java/jfreechart-1.0.11:1.0 dev-java/jdom:0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/statcvs/statcvs-0.5.0-source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b20d8ad92c561acf0c214c3adba3d40d
diff --git a/metadata/md5-cache/dev-vcs/statsvn-0.5.0 b/metadata/md5-cache/dev-vcs/statsvn-0.5.0
index c3d69153a108..0a5921fb1180 100644
--- a/metadata/md5-cache/dev-vcs/statsvn-0.5.0
+++ b/metadata/md5-cache/dev-vcs/statsvn-0.5.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 >=dev-vcs/subversion-1.3.0 dev-java/xerces:2 >=dev-vcs/statcvs-0.5:0 >=dev-java/backport-util-concurrent-3.1:0 dev-java/jcommon:1.0 dev-java/jfreechart:1.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/statsvn/statsvn-0.5.0-source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99db7b31f080242de753e1566dd9a109
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.7.21 b/metadata/md5-cache/dev-vcs/subversion-1.7.21
index 47658b78e86a..116e2bb91fef 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.7.21
+++ b/metadata/md5-cache/dev-vcs/subversion-1.7.21
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.6.18[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/ap
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.7.21.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7383ff61e6a18db76fb16d74359c7770
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.8.14 b/metadata/md5-cache/dev-vcs/subversion-1.8.14
index ea3e5ec22053..33e5ed720ed7 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.8.14
+++ b/metadata/md5-cache/dev-vcs/subversion-1.8.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 de
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.8.14.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba7cb516a2ca6b38bcb23594ba1e8faf
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.8.15 b/metadata/md5-cache/dev-vcs/subversion-1.8.15
index 5c6109912e75..6aa6dcdcd953 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.8.15
+++ b/metadata/md5-cache/dev-vcs/subversion-1.8.15
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 de
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.8.15.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-single	c49250968781888465d5a8597376297f	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-single	c49250968781888465d5a8597376297f	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dae992898ce2d592e77334040b392bea
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.2 b/metadata/md5-cache/dev-vcs/subversion-1.9.2
index 53d7118ec034..4f569ada66e4 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.2
+++ b/metadata/md5-cache/dev-vcs/subversion-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 de
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.9.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-single	c49250968781888465d5a8597376297f	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-single	c49250968781888465d5a8597376297f	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d38052044c80aa1793b08877d25ccf44
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.3 b/metadata/md5-cache/dev-vcs/subversion-1.9.3
index f1f6164cbe9a..c54bb2082239 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.3
+++ b/metadata/md5-cache/dev-vcs/subversion-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 de
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.9.3.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-single	c49250968781888465d5a8597376297f	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	db-use	a4966c7f4f7df444ead1212848c13cc9	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-single	c49250968781888465d5a8597376297f	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8bc776df4b462e7d3c651f80db4b28de
diff --git a/metadata/md5-cache/games-arcade/gnome-nibbles-3.18.2 b/metadata/md5-cache/games-arcade/gnome-nibbles-3.18.2
index 37dd3334b63e..ce20f78e19c3 100644
--- a/metadata/md5-cache/games-arcade/gnome-nibbles-3.18.2
+++ b/metadata/md5-cache/games-arcade/gnome-nibbles-3.18.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14.4:1
 DESCRIPTION=Nibbles clone for Gnome
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Nibbles
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14.4:1.0 >=media-libs/clutter-gtk-1.2:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-nibbles/3.18/gnome-nibbles-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cd5d8dac5a6b10ef57708c53f5b7a810
+_md5_=4f8163b850cb0fca3b23ba70adb93da4
diff --git a/metadata/md5-cache/games-arcade/gnome-robots-3.18.1 b/metadata/md5-cache/games-arcade/gnome-robots-3.18.1
index 868649304fac..89ba4777c64f 100644
--- a/metadata/md5-cache/games-arcade/gnome-robots-3.18.1
+++ b/metadata/md5-cache/games-arcade/gnome-robots-3.18.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.36.2:2 >=media-libs/libcanb
 DESCRIPTION=Avoid the robots and make them crash into each other
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Robots
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.36.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-robots/3.18/gnome-robots-3.18.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=aec68b1c19c6588b16e552ad448d8659
+_md5_=cb643bd04ac8b07fd196b9bfddb8db4c
diff --git a/metadata/md5-cache/games-board/domination-1.1.1.6 b/metadata/md5-cache/games-board/domination-1.1.1.6
index f64850f9f28f..df0ec77a220e 100644
--- a/metadata/md5-cache/games-board/domination-1.1.1.6
+++ b/metadata/md5-cache/games-board/domination-1.1.1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.6.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98b95b59080a4193e4fd2bbc9f51e6e1
diff --git a/metadata/md5-cache/games-board/four-in-a-row-3.18.2 b/metadata/md5-cache/games-board/four-in-a-row-3.18.2
index e99d9c77c68d..03fe9b34c1a0 100644
--- a/metadata/md5-cache/games-board/four-in-a-row-3.18.2
+++ b/metadata/md5-cache/games-board/four-in-a-row-3.18.2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26[g
 DESCRIPTION=Make lines of the same color to win
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Four-in-a-row
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.13.2:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/four-in-a-row/3.18/four-in-a-row-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=44d7383ebb1ae37b616d9562e2a8e803
+_md5_=7d25519df38fe67c8345d73dfd16c291
diff --git a/metadata/md5-cache/games-board/gnome-chess-3.18.0 b/metadata/md5-cache/games-board/gnome-chess-3.18.0
index 7072f3e0f0fa..6180e1fa8d22 100644
--- a/metadata/md5-cache/games-board/gnome-chess-3.18.0
+++ b/metadata/md5-cache/games-board/gnome-chess-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.15:3 |
 DESCRIPTION=Play the classic two-player boardgame of chess
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Chess
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.15:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/3.18/gnome-chess-3.18.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b4550075e9623198370f5c910e81525a
+_md5_=b25154dc9d40ca0b786176f0665e9211
diff --git a/metadata/md5-cache/games-board/gnome-mahjongg-3.18.0 b/metadata/md5-cache/games-board/gnome-mahjongg-3.18.0
index 250e5fb986a8..f9135ba35fcf 100644
--- a/metadata/md5-cache/games-board/gnome-mahjongg-3.18.0
+++ b/metadata/md5-cache/games-board/gnome-mahjongg-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.13.2:3
 DESCRIPTION=Disassemble a pile of tiles by removing matching pairs
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Mahjongg
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.13.2:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mahjongg/3.18/gnome-mahjongg-3.18.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b9a9e091435f9be6af337a76cb3e439e
+_md5_=eeb9c465c1f2c6ebad3c76e11dcd1467
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.18.2 b/metadata/md5-cache/games-board/gnome-mines-3.18.2
index 87d3f9cb8f18..29013c0a4933 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.18.2
+++ b/metadata/md5-cache/games-board/gnome-mines-3.18.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.12:3
 DESCRIPTION=Clear hidden mines from a minefield
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Mines
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-mines/3.18/gnome-mines-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ac65aff6af6da1f271e1293abbf39493
+_md5_=1fcbb9de752f8bfad3ee6318b527840b
diff --git a/metadata/md5-cache/games-board/iagno-3.18.2 b/metadata/md5-cache/games-board/iagno-3.18.2
index c5e4496fda74..103dee6f0ba7 100644
--- a/metadata/md5-cache/games-board/iagno-3.18.2
+++ b/metadata/md5-cache/games-board/iagno-3.18.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanber
 DESCRIPTION=Dominate the board in a classic version of Reversi
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Iagno
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 !<x11-themes/gnome-themes-standard-3.14 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/iagno/3.18/iagno-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bc0b0cceb16f8d828a0ad57fb6753c17
+_md5_=8024cbba5eb2316e0315f6c2980036bf
diff --git a/metadata/md5-cache/games-board/megamek-0.34.10 b/metadata/md5-cache/games-board/megamek-0.34.10
index dcc21ece3239..dcc25657fc80 100644
--- a/metadata/md5-cache/games-board/megamek-0.34.10
+++ b/metadata/md5-cache/games-board/megamek-0.34.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/megamek/MegaMek-v0.34.10.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e89d8b2d361c02619c131b8acfccba63
diff --git a/metadata/md5-cache/games-board/tali-3.18.0 b/metadata/md5-cache/games-board/tali-3.18.0
index 8ed31ef3b6f6..e9c0a0f5cbbf 100644
--- a/metadata/md5-cache/games-board/tali-3.18.0
+++ b/metadata/md5-cache/games-board/tali-3.18.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.15:3 app-te
 DESCRIPTION=Beat the odds in a poker-style dice game
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Tali
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.15:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/tali/3.18/tali-3.18.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5a926981378a2373e1b653bebefac710
+_md5_=8fb48a6e7236c41c54556102245388fe
diff --git a/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r4 b/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r4
index ebf40f91689b..1f18a635d1b7 100644
--- a/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r4
+++ b/metadata/md5-cache/games-emulation/visualboyadvance-1.7.2-r4
@@ -4,10 +4,10 @@ DESCRIPTION=gameboy, gameboy color, and gameboy advance emulator
 EAPI=5
 HOMEPAGE=http://vba.ngemu.com/
 IUSE=gtk cpu_flags_x86_mmx nls
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0 media-libs/libsdl[joystick,sound,video] sys-libs/zlib[minizip] gtk? ( >=x11-libs/gtk+-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libglademm-2.4:2.4 >=dev-libs/libsigc++-2.6:2 ) nls? ( virtual/libintl ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz mirror://gentoo/visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	games	2cf0d67d765e6358b435ccda30c13ad8	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=61d409ee2fa83f8fd6c873a76f0070ec
+_md5_=9580af4b4f10787f604cf7f25c5a26c7
diff --git a/metadata/md5-cache/games-misc/lolcat-42.1.43 b/metadata/md5-cache/games-misc/lolcat-42.1.43
index bef7a7745081..65dc3f9278a4 100644
--- a/metadata/md5-cache/games-misc/lolcat-42.1.43
+++ b/metadata/md5-cache/games-misc/lolcat-42.1.43
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby20] >
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://rubygems/lolcat-42.1.43.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1501b8c802842a41c44fbef9c0d6ad1c
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.18.0 b/metadata/md5-cache/games-puzzle/five-or-more-3.18.0
index f8b5d5ec0ffb..cdba655774cc 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.18.0
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.12:3 a
 DESCRIPTION=Five or More Game for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Five%20or%20more
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.18/five-or-more-3.18.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f8f7661bb68cde555d1c654d2c97c123
+_md5_=e1c073d002400b7a8dd28d88598f369d
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.18.2 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.18.2
index c28b4bae0399..0dd180dfa8b4 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.18.2
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.18.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.15:3
 DESCRIPTION=Slide blocks to solve the puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Klotski
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32.0 >=x11-libs/gtk+-3.15:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.18/gnome-klotski-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a0f6491d1b9ce25afcb2745e3c318fe8
+_md5_=5329879e7db9ae5c2d1ae30594f77f3d
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.18.2 b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.18.2
index a20a8af95dd3..703cf46bcaaa 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-3.18.2
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-3.18.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8[introspection] dev-libs/json-g
 DESCRIPTION=Test your logic skills in this number grid puzzle
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.15:3[introspection] x11-libs/pango[introspection] games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/3.18/gnome-sudoku-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=070f4f097acd969e7fdeb2c7aaa36135
+_md5_=1cd392380db6e56fce5e860801c64fcd
diff --git a/metadata/md5-cache/games-puzzle/gnome-taquin-3.18.2 b/metadata/md5-cache/games-puzzle/gnome-taquin-3.18.2
index d0dfdc087728..de940d370061 100644
--- a/metadata/md5-cache/games-puzzle/gnome-taquin-3.18.2
+++ b/metadata/md5-cache/games-puzzle/gnome-taquin-3.18.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra
 DESCRIPTION=Move tiles so that they reach their places
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Taquin
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26 >=x11-libs/gtk+-3.15:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-taquin/3.18/gnome-taquin-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d43388c2346f8b27e5d6a175bb12a3d8
+_md5_=66598b32651e50854bda811298f45772
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.18.0 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.18.0
index 5674b419a4d4..1d8d16bdb1c6 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.18.0
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.13.4:3
 DESCRIPTION=Complete the puzzle by matching numbered tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Tetravex
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32 >=x11-libs/gtk+-3.13.4:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.18/gnome-tetravex-3.18.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a8b3e6a6a6929b430f6a68e24b0ba2e7
+_md5_=d3458cf3b0cc3af0ecfa009ea4708e45
diff --git a/metadata/md5-cache/games-puzzle/hitori-3.16.2 b/metadata/md5-cache/games-puzzle/hitori-3.16.2
index a6bee413e93e..b0fbcb6fbf1b 100644
--- a/metadata/md5-cache/games-puzzle/hitori-3.16.2
+++ b/metadata/md5-cache/games-puzzle/hitori-3.16.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.4 >=x11-libs/gtk+-3.15:3 app-te
 DESCRIPTION=Logic puzzle game for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Hitori
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/cairo-1.4 >=x11-libs/gtk+-3.15:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/hitori/3.16/hitori-3.16.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1fd636156a607e566cc8452f56f1ebe8
+_md5_=5e2545217cfa19d05f24e22afce1f137
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-3.18.0 b/metadata/md5-cache/games-puzzle/lightsoff-3.18.0
index 89b895f878a4..74d4e934708b 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-3.18.0
+++ b/metadata/md5-cache/games-puzzle/lightsoff-3.18.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14:1.0
 DESCRIPTION=Turn off all the lights
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Lightsoff
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=x11-libs/gtk+-3.13.4:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/3.18/lightsoff-3.18.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c466234f74cae76201c076d3fa21a877
+_md5_=f8eacdd06789fa257ef7a599c3b8b9f5
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8 b/metadata/md5-cache/games-puzzle/pauker-1.8
index 9b694935265d..55df3f28a662 100644
--- a/metadata/md5-cache/games-puzzle/pauker-1.8
+++ b/metadata/md5-cache/games-puzzle/pauker-1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1349b2574446fadb1e3ac24075beae8
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-3.18.0 b/metadata/md5-cache/games-puzzle/quadrapassel-3.18.0
index 6319c181609e..54ae01ab1680 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-3.18.0
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-3.18.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0
 DESCRIPTION=Fit falling blocks together
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Quadrapassel
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.12:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/3.18/quadrapassel-3.18.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8a46daba9695a00836e444efc3db64d4
+_md5_=01693e549b862a23cfdef8a777d1df9f
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-3.18.1 b/metadata/md5-cache/games-puzzle/swell-foop-3.18.1
index 95acd1361e6f..4ff6e5b3cf6e 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-3.18.1
+++ b/metadata/md5-cache/games-puzzle/swell-foop-3.18.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter
 DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Swell%20Foop
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0 >=x11-libs/gtk+-3.12:3 games-misc/games-envd !gnome-extra/gnome-games
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/3.18/swell-foop-3.18.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	gnome-games	050c2b2fb4f83be4408fdc6cdf17f468	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=56f3a50e9609d8064cba04468b57d829
+_md5_=b64238aaa5950a2229a8286129e9075f
diff --git a/metadata/md5-cache/games-rpg/manaplus-9999 b/metadata/md5-cache/games-rpg/manaplus-9999
new file mode 100644
index 000000000000..480a96e73ff4
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/manaplus-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/wqy-microhei media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-libs/libpng:0= media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) virtual/pkgconfig nls? ( sys-devel/gettext ) !<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-vcs/git-1.8.2.1
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=5
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=mumble nls opengl pugixml test
+LICENSE=GPL-2+
+RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/wqy-microhei media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-libs/libpng:0= media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) games-misc/games-envd
+SLOT=0
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=8f545ef5712d1e294211a259403a7ba6
diff --git a/metadata/md5-cache/games-strategy/freecol-0.11.5 b/metadata/md5-cache/games-strategy/freecol-0.11.5
index dec58b613b37..066921d4dd03 100644
--- a/metadata/md5-cache/games-strategy/freecol-0.11.5
+++ b/metadata/md5-cache/games-strategy/freecol-0.11.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jre-1.7 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freecol/freecol-0.11.5-src.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f586801302fa809fe769ecb692678405
diff --git a/metadata/md5-cache/games-strategy/triplea-1.8.0.5 b/metadata/md5-cache/games-strategy/triplea-1.8.0.5
index 1aec63cb0e9a..f10b927aae24 100644
--- a/metadata/md5-cache/games-strategy/triplea-1.8.0.5
+++ b/metadata/md5-cache/games-strategy/triplea-1.8.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-httpclient:3 dev-java/apple-java-extensions-bin dev-jav
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/triplea/triplea_1_8_0_5_source_code_only.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc3a6b747f5aabb2ba01ad52fd691524
diff --git a/metadata/md5-cache/games-strategy/triplea-1.8.0.9 b/metadata/md5-cache/games-strategy/triplea-1.8.0.9
index a781d299644c..274a55579848 100644
--- a/metadata/md5-cache/games-strategy/triplea-1.8.0.9
+++ b/metadata/md5-cache/games-strategy/triplea-1.8.0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-java/commons-httpclient:3 dev-java/commons-logging dev-java/junit:4
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/triplea/triplea_1_8_0_9_source_code_only.zip
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	games	2cf0d67d765e6358b435ccda30c13ad8	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cbebb52d1e0dc1a44a319f6ed3fa6777
diff --git a/metadata/md5-cache/gnome-base/dconf-editor-3.18.2 b/metadata/md5-cache/gnome-base/dconf-editor-3.18.2
index d48c1fa56d8b..d8b8cfcc7888 100644
--- a/metadata/md5-cache/gnome-base/dconf-editor-3.18.2
+++ b/metadata/md5-cache/gnome-base/dconf-editor-3.18.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.39.3:2 dev-libs/libxml2 >=gnome-base/dconf-0.23.2 >=x11
 DESCRIPTION=Graphical tool for editing the dconf configuration database
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/dconf-editor
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.39.3:2 dev-libs/libxml2 >=gnome-base/dconf-0.23.2 >=x11-libs/gtk+-3.14.0:3 !<gnome-base/dconf-0.22[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/dconf-editor/3.18/dconf-editor-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=912e25737c628efdb700ddb92e665981
+_md5_=90844601858d5dd889a13b13dc06e300
diff --git a/metadata/md5-cache/gnome-base/gconf-3.2.6-r4 b/metadata/md5-cache/gnome-base/gconf-3.2.6-r4
index c09320caaf03..8fb092b9165b 100644
--- a/metadata/md5-cache/gnome-base/gconf-3.2.6-r4
+++ b/metadata/md5-cache/gnome-base/gconf-3.2.6-r4
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME configuration system and daemon
 EAPI=5
 HOMEPAGE=https://projects.gnome.org/gconf/
 IUSE=debug +introspection ldap policykit debug 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 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.34.3: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/dbus-glib-0.100.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(-)?] >=sys-apps/dbus-1.6.18-r1:=[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/libxml2-2.9.1-r4: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[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(-)?] ) policykit? ( sys-auth/polkit:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=14827244ad408ef5499188a6bc2ef4af
+_md5_=cdb23ac3b46bc09bd886aec3a3336b92
diff --git a/metadata/md5-cache/gnome-base/gdm-3.18.2 b/metadata/md5-cache/gnome-base/gdm-3.18.2
index 9f898f62ad2f..a95e290ee4f7 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.18.2
+++ b/metadata/md5-cache/gnome-base/gdm-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME Display Manager for managing graphical display servers and use
 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
+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 >=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 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
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.18/gdm-3.18.2.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	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=17797ae3c29cd3e09031a1db4b3fd2d0
+_md5_=230b613ad3ab50c1be0ba258f8ee1945
diff --git a/metadata/md5-cache/gnome-base/gnome-3.18.0 b/metadata/md5-cache/gnome-base/gnome-3.18.0
index c7d3ad74c6be..c4e5f91ce508 100644
--- a/metadata/md5-cache/gnome-base/gnome-3.18.0
+++ b/metadata/md5-cache/gnome-base/gnome-3.18.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta package for GNOME 3, merge this package to install
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
 IUSE=accessibility +bluetooth +classic +cdr cups +extras
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=metapackage
 PDEPEND=>=gnome-base/gvfs-1.26[udisks]
 RDEPEND=>=gnome-base/gnome-core-libs-3.18.0[cups?] >=gnome-base/gnome-core-apps-3.18.0[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.18.0 >=x11-wm/mutter-3.18.0 >=gnome-base/gnome-shell-3.18.0[bluetooth?] >=x11-themes/gnome-backgrounds-3.18.0 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.18 >=app-accessibility/at-spi2-core-2.18 >=app-accessibility/caribou-0.4.19 >=app-accessibility/orca-3.18.0 >=gnome-extra/mousetweaks-3.12.0 ) classic? ( >=gnome-extra/gnome-shell-extensions-3.18.0 ) extras? ( >=gnome-base/gnome-extra-apps-3.18.0 )
 SLOT=2.0
-_md5_=1f3e29809ee22effdc0c789aa62e2521
+_md5_=d514b37a7855bbd5317008ad4d0afbe2
diff --git a/metadata/md5-cache/gnome-base/gnome-common-3.18.0 b/metadata/md5-cache/gnome-base/gnome-common-3.18.0
index 6a8f88f5e957..98b201f3e26c 100644
--- a/metadata/md5-cache/gnome-base/gnome-common-3.18.0
+++ b/metadata/md5-cache/gnome-base/gnome-common-3.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=Common files for development of Gnome packages
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-common
 IUSE=+autoconf-archive
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 ) !autoconf-archive? ( !>=sys-devel/autoconf-archive-2015.02.04 )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c5203490b12e6e3a3203e41427450bc9
+_md5_=4a6b426ac80a207cdb53aa5b68ea3468
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.18.2 b/metadata/md5-cache/gnome-base/gnome-control-center-3.18.2
index d957d3ff08cc..689d24631b0b 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.18.2
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
 IUSE=+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=dev-libs/glib-2.39.91:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.15:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.15.4 >=gnome-base/gnome-desktop-3.17.4:3= >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= virtual/libgudev virtual/opengl x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.2.12:0.2 >=net-libs/gnome-online-accounts-3.15.1 ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) >=sys-apps/accountsservice-0.6.39 x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) i18n? ( >=gnome-base/libgnomekbd-3 ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300 !<net-wireless/gnome-bluetooth-3.3.2
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.18/gnome-control-center-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=254297150c7150c36d55ee9fa23d09cc
+_md5_=47f794cd7179aecbb31821f7a6598092
diff --git a/metadata/md5-cache/gnome-base/gnome-core-apps-3.18.0 b/metadata/md5-cache/gnome-base/gnome-core-apps-3.18.0
index ed14cb9ebc2c..1a848aef65dd 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-apps-3.18.0
+++ b/metadata/md5-cache/gnome-base/gnome-core-apps-3.18.0
@@ -3,8 +3,8 @@ DESCRIPTION=Sub-meta package for the core applications integrated with GNOME 3
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
 IUSE=+bluetooth +cdr cups
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=metapackage
 RDEPEND=>=gnome-base/gnome-core-libs-3.18.0[cups?] >=gnome-base/gnome-session-3.18.0 >=gnome-base/gnome-menus-3.10.1:3 >=gnome-base/gnome-settings-daemon-3.18.0[cups?] >=gnome-base/gnome-control-center-3.18.0[cups?] >=app-crypt/gcr-3.18.0 >=gnome-base/nautilus-3.18.0 >=gnome-base/gnome-keyring-3.18.0 >=gnome-extra/evolution-data-server-3.18 >=app-crypt/seahorse-3.18.0 >=app-editors/gedit-3.18.0 >=app-text/evince-3.18.0 >=gnome-extra/gnome-contacts-3.18.0 >=media-gfx/eog-3.18.0 >=media-video/totem-3.18.0 >=net-im/empathy-3.12.11 >=x11-terms/gnome-terminal-3.18.0 >=gnome-extra/gnome-user-docs-3.18.0 >=gnome-extra/yelp-3.18.0 >=x11-themes/adwaita-icon-theme-3.18.0 >=x11-themes/gnome-themes-standard-3.18.0 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0 ) cdr? ( >=app-cdr/brasero-3.12.1 ) !gnome-base/gnome-applets
 SLOT=3.0
-_md5_=a2c692b3f3d615b86cae97a9f38dcf51
+_md5_=bb8b1ad7414d73a273786cb944e3fe18
diff --git a/metadata/md5-cache/gnome-base/gnome-core-libs-3.18.0 b/metadata/md5-cache/gnome-base/gnome-core-libs-3.18.0
index 9cc609ce06bd..f72aad5672b6 100644
--- a/metadata/md5-cache/gnome-base/gnome-core-libs-3.18.0
+++ b/metadata/md5-cache/gnome-base/gnome-core-libs-3.18.0
@@ -3,8 +3,8 @@ DESCRIPTION=Sub-meta package for the core libraries of GNOME 3
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
 IUSE=cups python
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=metapackage
 RDEPEND=>=dev-libs/glib-2.46:2 >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38 >=media-libs/clutter-1.24:1.0 >=x11-libs/gtk+-3.18.0:3[cups?] >=dev-libs/atk-2.18 >=x11-libs/libwnck-3.14:3 >=gnome-base/librsvg-2.40.10 >=gnome-base/gnome-desktop-3.18.0:3 >=x11-libs/startup-notification-0.12 >=gnome-base/gvfs-1.26 >=gnome-base/dconf-0.24 || ( >=media-libs/gstreamer-0.10.36:0.10 >=media-libs/gstreamer-1.6.1:1.0 ) || ( >=media-libs/gst-plugins-base-0.10.36:0.10 >=media-libs/gst-plugins-base-1.6.1:1.0 ) || ( >=media-libs/gst-plugins-good-0.10.31:0.10 >=media-libs/gst-plugins-good-1.6.1:1.0 ) python? ( >=dev-python/pygobject-3.18.0:3 )
 SLOT=3.0
-_md5_=ec5e366a6139cc08c8c6e3d59348a41b
+_md5_=9e9bd470ac04603080f7d7a1449f08d6
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-3.18.2 b/metadata/md5-cache/gnome-base/gnome-desktop-3.18.2
index 133171b40347..7dc1f9d38572 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-3.18.2
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
 IUSE=+introspection debug test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
 SLOT=3/12
 SRC_URI=mirror://gnome/sources/gnome-desktop/3.18/gnome-desktop-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e640f7fb5b23c8cf4070c0ecdcda46bc
+_md5_=744ca98ed842be5cb7f71dd8ff10af61
diff --git a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.18.0 b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.18.0
index f99a3505e2a5..4696cce8654b 100644
--- a/metadata/md5-cache/gnome-base/gnome-extra-apps-3.18.0
+++ b/metadata/md5-cache/gnome-base/gnome-extra-apps-3.18.0
@@ -3,8 +3,8 @@ DESCRIPTION=Sub-meta package for the applications of GNOME 3
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
 IUSE=+games +share +shotwell +tracker
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=gnome-base/gnome-core-libs-3.18.0 >=app-admin/gnome-system-log-3.9.90 >=app-arch/file-roller-3.16.4 >=app-dicts/gnome-dictionary-3.18.0 >=gnome-base/dconf-editor-3.18.0 >=gnome-extra/gconf-editor-3 >=gnome-extra/gnome-calculator-3.18.0 >=gnome-extra/gnome-power-manager-3.18.0 >=gnome-extra/gnome-search-tool-3.6 >=gnome-extra/gnome-system-monitor-3.18.0 >=gnome-extra/gnome-tweak-tool-3.18.0 >=gnome-extra/gnome-weather-3.18.0 >=gnome-extra/gucharmap-3.18.0:2.90 >=gnome-extra/nautilus-sendto-3.8.2 >=gnome-extra/sushi-3.18.0 >=mail-client/evolution-3.18.0 >=media-gfx/gnome-font-viewer-3.16.2 >=media-gfx/gnome-screenshot-3.18.0 >=media-sound/sound-juicer-3.18.0 >=media-video/cheese-3.18.0 >=net-analyzer/gnome-nettool-3.8 >=net-misc/vinagre-3.18.0 >=net-misc/vino-3.18.0 >=sys-apps/baobab-3.18.0 >=sys-apps/gnome-disk-utility-3.18.0 >=www-client/epiphany-3.18.0 games? ( >=games-arcade/gnome-nibbles-3.18.0 >=games-arcade/gnome-robots-3.18.0 >=games-board/four-in-a-row-3.18.0 >=games-board/gnome-chess-3.18.0 >=games-board/gnome-mahjongg-3.18.0 >=games-board/gnome-mines-3.18.0 >=games-board/iagno-3.18.0 >=games-board/tali-3.18.0 >=games-puzzle/five-or-more-3.18.0 >=games-puzzle/gnome-klotski-3.18.0 >=games-puzzle/gnome-sudoku-3.18.0 >=games-puzzle/gnome-taquin-3.18.0 >=games-puzzle/gnome-tetravex-3.18.0 >=games-puzzle/hitori-3.16.2 >=games-puzzle/lightsoff-3.18.0 >=games-puzzle/quadrapassel-3.18.0 >=games-puzzle/swell-foop-3.18.0 ) share? ( >=gnome-extra/gnome-user-share-3.18.0 ) shotwell? ( >=media-gfx/shotwell-0.22 ) tracker? ( >=app-misc/tracker-1.6 >=gnome-extra/gnome-documents-3.18.0 >=media-gfx/gnome-photos-3.18.0 >=media-sound/gnome-music-3.18.0 )
 SLOT=3.0
-_md5_=98c119d3a5a015457b56fe4d6cc158e8
+_md5_=5c8066f0f935775935fb09fa6c04b79b
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.18.3 b/metadata/md5-cache/gnome-base/gnome-keyring-3.18.3
index b66beddde1af..95c54d125ba5 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.18.3
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.18.3
@@ -4,10 +4,10 @@ DESCRIPTION=Password and keyring managing daemon
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
 IUSE=+caps pam selinux +ssh-agent test +filecaps debug test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) >=app-crypt/gnupg-2.0.28 app-crypt/pinentry[gnome-keyring]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.18/gnome-keyring-3.18.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a279c84c7edba46891ca6a99c47470b4
+_md5_=55460abbdf030c3b62c36a282845f13d
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.18.0 b/metadata/md5-cache/gnome-base/gnome-light-3.18.0
index 425aa6cc9050..0883d8a64a00 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-3.18.0
+++ b/metadata/md5-cache/gnome-base/gnome-light-3.18.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta package for GNOME-Light, merge this package to install
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
 IUSE=cups +gnome-shell
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=metapackage
 PDEPEND=>=gnome-base/gvfs-1.26.0
 RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.18.0[cups?] >=gnome-base/gnome-session-3.18.0 >=gnome-base/gnome-menus-3.10.1:3 >=gnome-base/gnome-settings-daemon-3.18.0[cups?] >=gnome-base/gnome-control-center-3.18.0[cups?] >=gnome-base/nautilus-3.18.0 gnome-shell? ( >=x11-wm/mutter-3.18.0 >=gnome-base/gnome-shell-3.18.0 ) >=x11-themes/adwaita-icon-theme-3.18.0 >=x11-themes/gnome-themes-standard-3.18.0 >=x11-themes/gnome-backgrounds-3.18.0 >=x11-terms/gnome-terminal-3.18.0
 SLOT=2.0
-_md5_=a79e7ff2605cf8c9d36688e02ddfd8bf
+_md5_=fe098705bb292ce4deb6f52a74736b4c
diff --git a/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1 b/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
index 5d6d748072a3..260bae9543d3 100644
--- a/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
+++ b/metadata/md5-cache/gnome-base/gnome-menus-3.13.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for the Desktop Menu fd.o specification
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-menus
 IUSE=+introspection test debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !<gnome-base/gnome-menus-3.0.1-r1:0
 SLOT=3
 SRC_URI=mirror://gnome/sources/gnome-menus/3.13/gnome-menus-3.13.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=77c7ddd81b8994aff8865b5fa7f3e4b7
+_md5_=082f67287d0a184c0242dfdf80fbf79f
diff --git a/metadata/md5-cache/gnome-base/gnome-session-3.18.1.2 b/metadata/md5-cache/gnome-base/gnome-session-3.18.1.2
index 0ef5a3b4c48a..abb5705ad80e 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-3.18.1.2
+++ b/metadata/md5-cache/gnome-base/gnome-session-3.18.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Gnome session manager
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-session
 IUSE=doc elibc_FreeBSD ipv6 systemd debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2 FDL-1.1
 RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( dev-libs/libexecinfo ) virtual/opengl x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) gnome-base/gnome-settings-daemon >=gnome-base/gsettings-desktop-schemas-0.1.7 >=x11-themes/gnome-themes-standard-2.91.92 sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/3.18/gnome-session-3.18.1.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0a8fb662c5ae074ffc685a003c046cd0
+_md5_=da268c57ca818dee07503db87f395ca6
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.18.2 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.18.2
index 942c4d0c873a..0482b4b35342 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.18.2
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=Gnome Settings Daemon
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-settings-daemon
 IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.37.7:2[dbus] >=x11-libs/gtk+-3.15.3:3 >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.15.4 >=gnome-base/librsvg-2.36.2 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.1.2:2.0 >=dev-libs/libgweather-3.9.5:2 >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-0.9.9.1 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) gnome-base/dconf !openrc-force? ( sys-apps/systemd ) >=x11-themes/gnome-themes-standard-2.91 >=x11-themes/gnome-icon-theme-2.91 >=x11-themes/gnome-icon-theme-symbolic-2.91 !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3
 REQUIRED_USE=input_devices_wacom? ( udev ) smartcard? ( udev ) test? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.18/gnome-settings-daemon-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cef933f54bafe146ac5aaa3ecc354c5b
+_md5_=b442eec09e6ec8153401ac7c246fc16f
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.18.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.18.3
index 92b498652d3f..3732a8ead75a 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.18.3
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.18.3
@@ -4,7 +4,7 @@ DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 IUSE=+bluetooth +networkmanager +nls -openrc-force python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
 RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.45.4:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=media-libs/clutter-1.21.5:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.14 >=gnome-base/gnome-keyring-3.3.90 gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.18.1[introspection] >=x11-libs/startup-notification-0.11 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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8[introspection] ) >=sys-auth/polkit-0.101[introspection] >=app-accessibility/caribou-0.4.8 media-libs/cogl[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/3.18/gnome-shell-3.18.3.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=49989581c586927bb17e8f61aa0464e0
+_md5_=1c7d09e8e5170d47d421f825d3a2a190
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.18.1 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.18.1
index 969599f2678f..6d58e86e1e08 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.18.1
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.18/gsettings-desktop-schemas-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b02cd162f13e715eeb66c16ac2906d59
+_md5_=57f28b8712b8dbf674a664b3899e0e26
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.26.3 b/metadata/md5-cache/gnome-base/gvfs-1.26.3
index fa853a3dff25..3cb9ba0f6507 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.26.3
+++ b/metadata/md5-cache/gnome-base/gvfs-1.26.3
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual filesystem implementation for gio
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 IUSE=afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) google? ( >=dev-libs/libgdata-0.17.3:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
 REQUIRED_USE=cdda? ( udev ) google? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) systemd? ( udisks )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.26/gvfs-1.26.3.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ce542c948fc9ba88723fdcfd077188ea
+_md5_=54a1583140f60741b5c87700fc32edc4
diff --git a/metadata/md5-cache/gnome-base/libgtop-2.32.0 b/metadata/md5-cache/gnome-base/libgtop-2.32.0
index 08c10b809bac..28e3502ff850 100644
--- a/metadata/md5-cache/gnome-base/libgtop-2.32.0
+++ b/metadata/md5-cache/gnome-base/libgtop-2.32.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library that provides top functionality to applications
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/libgtop
 IUSE=+introspection debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2
 SLOT=2/10
 SRC_URI=mirror://gnome/sources/libgtop/2.32/libgtop-2.32.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2880dbdca7d821155fe30d490df65e2e
+_md5_=14555c0c3d9e8319b823252e50dd5e21
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.13 b/metadata/md5-cache/gnome-base/librsvg-2.40.13
index 64277a20ebca..e9deaf021bfb 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.13
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.13
@@ -4,11 +4,11 @@ DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
 IUSE=+introspection vala tools 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3: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/cairo-1.12.14-r4[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/pango-1.36.3[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/libxml2-2.9.1-r4: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/libcroco-0.6.8-r1[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.30.7:2[introspection?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.13.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8e0a3346bc845bd9d71357eaa593c605
+_md5_=97d7c195530ada4b89e979e1ed0fa200
diff --git a/metadata/md5-cache/gnome-base/nautilus-3.18.5 b/metadata/md5-cache/gnome-base/nautilus-3.18.5
index deb4f9a51eb8..5cf76b45b4b6 100644
--- a/metadata/md5-cache/gnome-base/nautilus-3.18.5
+++ b/metadata/md5-cache/gnome-base/nautilus-3.18.5
@@ -4,7 +4,7 @@ DESCRIPTION=A file manager for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
 IUSE=exif gnome +introspection packagekit +previewer selinux sendto tracker xmp test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
 PDEPEND=gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 x11-themes/gnome-icon-theme-symbolic ) tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk]
 RDEPEND=>=dev-libs/glib-2.45.7:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.18.5:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-0.16:= ) xmp? ( >=media-libs/exempi-2.1.0 ) packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/3.18/nautilus-3.18.5.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6e25e7077f78cb2618b516faf2d77353
+_md5_=9213b96bdb81036990da7f50b19803ac
diff --git a/metadata/md5-cache/gnome-extra/assogiate-0.2.1-r1 b/metadata/md5-cache/gnome-extra/assogiate-0.2.1-r1
index 568d04c82eca..f2072a0ebd91 100644
--- a/metadata/md5-cache/gnome-extra/assogiate-0.2.1-r1
+++ b/metadata/md5-cache/gnome-extra/assogiate-0.2.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=assoGiate is an editor of the file types database for GNOME
 EAPI=5
 HOMEPAGE=http://www.kdau.com/projects/assogiate
 IUSE=debug
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=amd64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.8:2 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-2.24.4-r3:2.4 >=dev-cpp/libxmlpp-2.40 >=dev-cpp/gnome-vfsmm-2.26.0-r1
 SLOT=0
 SRC_URI=http://www.kdau.com/files/assogiate-0.2.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ebcee2489b65d9e749742bb55afa0f51
+_md5_=95b968b6ccd4701c21baf1b8155b1556
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-2.8.6 b/metadata/md5-cache/gnome-extra/cinnamon-2.8.6
index 1e8bc7de0516..2255a6bceff4 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-2.8.6
+++ b/metadata/md5-cache/gnome-extra/cinnamon-2.8.6
@@ -4,11 +4,11 @@ DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-2.4:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-2.8.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-2.5[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=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(-)] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-2.4 >=gnome-extra/cinnamon-settings-daemon-2.4 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils dev-python/dbus-python[python_targets_python2_7] dev-python/gconf-python:2[python_targets_python2_7] dev-python/lxml[python_targets_python2_7] dev-python/pexpect[python_targets_python2_7] dev-python/pycairo[python_targets_python2_7] dev-python/pygobject:3[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(-)] dev-python/pyinotify[python_targets_python2_7] dev-python/pypam[python_targets_python2_7] dev-python/pillow[python_targets_python2_7] x11-themes/gnome-themes-standard[gtk] x11-themes/gnome-icon-theme-symbolic >=gnome-extra/nemo-2.4 >=gnome-extra/cinnamon-control-center-2.4 >=gnome-extra/cinnamon-screensaver-2.4 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) python_targets_python2_7 || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/2.8.6.tar.gz -> cinnamon-2.8.6.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4ad99e9cffa599edee830867ed515235
+_md5_=7e7efab6f9389cec414009e117067671
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1
index e8b6c39fa51b..0cbb3bfd97d0 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=Cinnamons's main interface to configure various aspects of the deskt
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+colord +cups input_devices_wacom debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-1.1[glib] >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/2.8.1.tar.gz -> cinnamon-control-center-2.8.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=23ed6f12f0efdf40ffcd0361d0d1258d
+_md5_=6608758308724136b69438c27e5422f3
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.8.0 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.8.0
index 2d439f248ed9..1e91c0ea5870 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+introspection systemd python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) >=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/pygobject:3[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(+)]
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/2.8.0.tar.gz -> cinnamon-desktop-2.8.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=07ea637af82420d68a61a754ad7e16cb
+_md5_=246f9d41f46834799972e7f9a6e33a1f
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-2.8.0 b/metadata/md5-cache/gnome-extra/cinnamon-menus-2.8.0
index 687dea65a90d..6054940a05e5 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-2.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+introspection debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/2.8.0.tar.gz -> cinnamon-menus-2.8.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2dd52afa845e6acf36ccf634150d3e1b
+_md5_=98733b71bb9bb96d90003f454bdc58ef
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.8.0-r1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.8.0-r1
index 8dc30d9f7731..c1d3afb94aa2 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.8.0-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Screensaver for Cinnamon
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=doc pam systemd debug python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=!~gnome-extra/cinnamon-1.8.8.1 !systemd? ( sys-auth/consolekit ) dev-python/pygobject:3[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(+)]
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/2.8.0.tar.gz -> cinnamon-screensaver-2.8.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5f817a5f34d8b98621ba7db9e1a178f7
+_md5_=866a4a3203b491a7aea1ef3e40414ff8
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-2.8.2 b/metadata/md5-cache/gnome-extra/cinnamon-session-2.8.2
index 05dcad3d1d47..1eca296226a8 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-2.8.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-2.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=Cinnamon session manager
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=doc ipv6 systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 ) !systemd? ( >=sys-power/upower-pm-utils-0.9.23 ) >=gnome-extra/cinnamon-desktop-2.6[systemd=] !systemd? ( sys-auth/consolekit )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/2.8.2.tar.gz -> cinnamon-session-2.8.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6e66bc24379b1d3aad158cf713fa9bb6
+_md5_=e2c762d8885093ed16a14b90a0bbb3dd
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.8.3 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.8.3
index 3517e3d8ca1c..c531c095a624 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.8.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=Cinnamon's settings daemon
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+colord cups input_devices_wacom smartcard systemd debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.6.3:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] >=media-sound/pulseaudio-0.9.16:0= sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/consolekit:0= )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/2.8.3.tar.gz -> cinnamon-settings-daemon-2.8.3.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f3a087f3147fbf7f8a28b043377c3cd8
+_md5_=debfd89a5e55fd7113d976124a1d721f
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.3 b/metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.3
index 100a6bb3e681..231b267e988b 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-2.8.3
@@ -3,10 +3,10 @@ DESCRIPTION=Translation data for Cinnamon
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=linguas_af linguas_am linguas_an linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_be@latin linguas_bg linguas_bn linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_ca@valencia linguas_crh linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_dz linguas_el linguas_en@shaw linguas_en_AU linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fil linguas_fo linguas_fr linguas_fr_CA linguas_frp linguas_fy linguas_ga linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_jv linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_ksw linguas_ku linguas_ky linguas_la linguas_li linguas_lo linguas_lt linguas_lv linguas_mai linguas_mg linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_nso linguas_oc linguas_om linguas_or linguas_pa linguas_pl linguas_ps linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rue linguas_rw linguas_sco linguas_shn linguas_si linguas_sk linguas_sl linguas_so linguas_sq linguas_sr linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_sw linguas_ta linguas_te linguas_tg linguas_th linguas_tl linguas_tlh linguas_tpi linguas_tr linguas_ts linguas_ug linguas_uk linguas_ur linguas_uz linguas_uz@cyrillic linguas_vi linguas_wa linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/2.8.3.tar.gz -> cinnamon-translations-2.8.3.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	l10n	714aaf78929eade946da5eaff7d2001a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b90381306c92095bec24c929dc3eb770
+_md5_=cb80791e33f5533023cdf0e1029ba682
diff --git a/metadata/md5-cache/gnome-extra/cjs-2.8.0 b/metadata/md5-cache/gnome-extra/cjs-2.8.0
index a064f52a0eaf..5f6aaa4e9211 100644
--- a/metadata/md5-cache/gnome-extra/cjs-2.8.0
+++ b/metadata/md5-cache/gnome-extra/cjs-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+cairo examples gtk test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=dev-lang/spidermonkey:24 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) !<gnome-extra/cinnamon-2.4
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/2.8.0.tar.gz -> cjs-2.8.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6ba09c36da76348901727588ead959ae
+_md5_=de021ed47c0fabef94ba9db38b3b3bef
diff --git a/metadata/md5-cache/gnome-extra/eiciel-0.9.11-r1 b/metadata/md5-cache/gnome-extra/eiciel-0.9.11-r1
index fb5d54625ebf..b45c48de3090 100644
--- a/metadata/md5-cache/gnome-extra/eiciel-0.9.11-r1
+++ b/metadata/md5-cache/gnome-extra/eiciel-0.9.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=ACL editor for GNOME, with Nautilus extension
 EAPI=5
 HOMEPAGE=http://rofi.roger-ferrer.org/eiciel/
 IUSE=xattr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3
 SLOT=0
 SRC_URI=http://rofi.roger-ferrer.org/eiciel/download/eiciel-0.9.11.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f7b6c2d5c2006074231d54134bd49a8a
+_md5_=a01a47b7017e76b00a2495764c7632db
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.18.5 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.18.5
index 2e389fb755a0..f68dcb9c49b1 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.18.5
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.18.5
@@ -4,7 +4,7 @@ DESCRIPTION=Evolution groupware backend
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=api-doc-extras +berkdb +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
 RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.40:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=net-libs/libsoup-2.42:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
 REQUIRED_USE=vala? ( introspection )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/54
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.5.tar.xz
 _eclasses_=db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e456bb984378899ba1ffd9aa49acdf54
+_md5_=79bc2b180550e8cd06ed6432eb94a335
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.18.5 b/metadata/md5-cache/gnome-extra/evolution-ews-3.18.5
index 74a1dd870f0f..b68e6e0ba06f 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.18.5
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.18.5
@@ -4,10 +4,10 @@ DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.40:2 dev-libs/libical:0= >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.18.5:0= >=mail-client/evolution-3.18.5:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.18/evolution-ews-3.18.5.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8b3be0d22859761942b15d8d88bfb5b8
+_md5_=16f3c49345e195c9b2104850a11d1efc
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-3.18.1 b/metadata/md5-cache/gnome-extra/gnome-boxes-3.18.1
index fe9cc7390069..2ee485532182 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple GNOME 3 application to access remote or virtual systems
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
 IUSE=smartcard usbredir
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2
 RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.2 >=x11-libs/gtk+-3.13.2:3 >=net-libs/gtk-vnc-0.4.4[gtk3] >=net-misc/spice-gtk-0.27[gtk3,smartcard?,usbredir?] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/fuse sys-fs/fuseiso sys-fs/mtools virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/3.18/gnome-boxes-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a358e82140a12d490ee9eae367a4444d
+_md5_=84676c3ed52df72d05b575ad3cf2c420
diff --git a/metadata/md5-cache/gnome-extra/gnome-builder-3.18.1 b/metadata/md5-cache/gnome-extra/gnome-builder-3.18.1
index 8cd491f742e1..307cc50aae06 100644
--- a/metadata/md5-cache/gnome-extra/gnome-builder-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-builder-3.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=Builder attempts to be an IDE for writing software for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Builder
 IUSE=+introspection python vala python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
 RDEPEND=>=dev-libs/gjs-1.42 >=dev-libs/glib-2.45.8:2[dbus] dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.23.4[ssh] >=dev-libs/libpeas-1.14.1 >=dev-libs/libxml2-2.9 dev-util/uncrustify sys-devel/clang >=x11-libs/gtk+-3.17.8:3[introspection?] >=x11-libs/gtksourceview-3.17.7:3.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3 ) vala? ( || ( dev-lang/vala:0.30[vapigen(+)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-builder/3.18/gnome-builder-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=df34e378fb2c388244371a58a7bc4bb2
+_md5_=ee0e7e9fce8ef405a3c59abf4b63bb80
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.18.3 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.18.3
index 281160db2318..4730b80c314a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.18.3
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-3.18.3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0 >=x11-libs/gtk+
 DESCRIPTION=A calculator application for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0 >=x11-libs/gtk+-3.11.6:3 >=x11-libs/gtksourceview-3.15.1:3.0 !<gnome-extra/gnome-utils-2.3 !gnome-extra/gcalctool
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5966556235119fa62dd8d18404465f70
+_md5_=050d62303b65d3404aa429faecdcf6a2
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-3.18.2.1 b/metadata/md5-cache/gnome-extra/gnome-calendar-3.18.2.1
index aff12f7079c1..51be39eab203 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-3.18.2.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-3.18.2.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.43.4:2 >=dev-libs/libical-1.0.1 >=gnome-extra/evolution
 DESCRIPTION=Manage your online calendars with simple and modern interface
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.43.4:2 >=dev-libs/libical-1.0.1 >=gnome-extra/evolution-data-server-3.17.1:= >=net-libs/gnome-online-accounts-3.2.0:= >=x11-libs/gtk+-3.15.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/3.18/gnome-calendar-3.18.2.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4d8a49475589a0c89f65bc9900262688
+_md5_=de376e9278dca70884585bba3dabe1a5
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-3.18.1 b/metadata/md5-cache/gnome-extra/gnome-characters-3.18.1
index c843084efab4..a61864121a86 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
 IUSE=test debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3:3[introspection] >=x11-libs/pango-1.36[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/3.18/gnome-characters-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6334bd9f50be63a231bcc7eb32e427f9
+_md5_=adae0e8e124687e88496c28c60bf3c18
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-3.18.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-3.18.0
index 3678b2be3977..e39ccc24b553 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-3.18.0
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=app-misc/geoclue-1.99.3:2.0 >=dev-libs/glib-2.39:2 >=dev-libs/libgweath
 DESCRIPTION=Clocks application for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/geoclue-1.99.3:2.0 >=dev-libs/glib-2.39:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.12:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/3.18/gnome-clocks-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=19c7c91630e7d652a2e04c65408884c0
+_md5_=ba17f60cb13dc0a924e02d87bd9170bd
diff --git a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.18.0 b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.18.0
index e9b3d5a4ca10..558c6eabe55f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-color-manager-3.18.0
+++ b/metadata/md5-cache/gnome-extra/gnome-color-manager-3.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=Color profile manager for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-color-manager
 IUSE=packagekit raw test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-color-manager/3.18/gnome-color-manager-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ae385872e41be1365d9be32428ecda9c
+_md5_=b7bf2376f2b512c78fa33411b28b3ecd
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-3.18.1 b/metadata/md5-cache/gnome-extra/gnome-contacts-3.18.1
index a2ccb536d693..e35d79da3799 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME contact management application
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
 IUSE=v4l
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/folks-0.9.5:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/3.18/gnome-contacts-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9b70186dec117f2d3624d6115625cfc5
+_md5_=59db4b5ad115c8dee8573cb3b5646e5d
diff --git a/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.7 b/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.7
index 96e3f6161625..d22643f8115a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.7
+++ b/metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.7
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.6:2 >=gnome-base/gnome-des
 DESCRIPTION=Thumbnail generator for directories
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.6:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-directory-thumbnailer/0.1/gnome-directory-thumbnailer-0.1.7.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3dd5aa2e3cd584ab3c2692d805ae6ac0
+_md5_=42e6c983706cc4fca5c19ab044437863
diff --git a/metadata/md5-cache/gnome-extra/gnome-documents-3.18.2-r1 b/metadata/md5-cache/gnome-extra/gnome-documents-3.18.2-r1
index 5271d8cc9d16..54908bf19754 100644
--- a/metadata/md5-cache/gnome-extra/gnome-documents-3.18.2-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-documents-3.18.2-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-misc/tracker-1:= >=app-text/evince-3.13.3[introspection] dev-libs/g
 DESCRIPTION=A document manager application for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Documents
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/tracker-1:= >=app-text/evince-3.13.3[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] gnome-base/gnome-desktop:3= >=media-libs/clutter-1.10:1.0 >=media-libs/clutter-gtk-1.3.2:1.0[introspection] >=net-libs/gnome-online-accounts-3.2.0 >=net-libs/libsoup-2.41.3:2.4 >=net-libs/libzapojit-0.0.2 >=net-libs/webkit-gtk-2.6:4 >=x11-libs/gdk-pixbuf-2.25:2[introspection] >=x11-libs/gtk+-3.15.5:3[introspection] x11-libs/pango[introspection] media-libs/clutter[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/gnome-icon-theme-symbolic
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-documents/3.18/gnome-documents-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b7b187e7f09d62cc3b4a38255f4829cb
+_md5_=ff6e642cafce883c1021381e9d58d0f9
diff --git a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90 b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
index 0523031bb6fd..8bf4754daf57 100644
--- a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
+++ b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90
@@ -4,10 +4,10 @@ DESCRIPTION=Setup your DVB devices, record and watch TV shows and browse EPG usi
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/action/show/Projects/DVBDaemon
 IUSE=nls totem vala
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4:3 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0:0 x11-libs/gtk+:3[introspection] virtual/libgudev:0 vala? ( || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 ) ) totem? ( media-video/totem )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dvb-daemon/0.2/gnome-dvb-daemon-0.2.90.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3e3795d574b5f82b679508721340ef02
+_md5_=39aab7b371174d88c79ec076ab0f68c8
diff --git a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.18.2 b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.18.2
index 20c7a8506146..2565177044dc 100644
--- a/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.18.2
+++ b/metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.18.2
@@ -3,11 +3,11 @@ DEPEND=app-text/yelp-tools dev-util/itstool sys-devel/gettext virtual/pkgconfig
 DESCRIPTION=Help a new user get started in GNOME
 EAPI=5
 HOMEPAGE=https://help.gnome.org/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=gnome-extra/gnome-user-docs
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.18/gnome-getting-started-docs-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=71ebc1d9274edf1f14460a55fa30cb02
+_md5_=b1e634f60d7050c135a589de5529dede
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-3.18.1 b/metadata/md5-cache/gnome-extra/gnome-logs-3.18.1
index 7dfc3e9ee472..a2b4b38e1c66 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=Log messages and event viewer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Logs
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.43.90:2 sys-apps/systemd >=x11-libs/gtk+-3.15.7:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/3.18/gnome-logs-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5cfc307104872c9c7cd2fa0697f102ec
+_md5_=4a5c3eb6d9629b52fe84aaeeaea371c7
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.18.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.18.0
index d5595a1e49ce..a27cbb894c33 100644
--- a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.18.0
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME power management service
 EAPI=5
 HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
 IUSE=test test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/gnome-icon-theme-symbolic
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-power-manager/3.18/gnome-power-manager-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4145c2c6e0a7b97250528dd12cf70209
+_md5_=ebe3c47e1bb00f970c1bd1fa44687c99
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.18.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.18.3
index f59fe8731332..44a3ccba5725 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.18.3
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-3.18.3
@@ -4,10 +4,10 @@ DESCRIPTION=JavaScript extensions for GNOME Shell
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.18/gnome-shell-extensions-3.18.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9685c4acf507d9118020b7e293a8b94f
+_md5_=9c17f2dee5eb39ab60b92d7ac1abbf66
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.18.2 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.18.2
index 629e04c4c7d2..225642d74b94 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.18.2
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.18.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Unofficial extension pack providing GNOME 2-like features for GNOME 3
 EAPI=5
 HOMEPAGE=http://frippery.org/extensions/index.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.18 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-3.18.2.tgz
-_md5_=c2ece3092fffeb6c651a96834ce6b286
+_md5_=a760effaf0c3a7c8fa5d2fe00f69df66
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.18.2 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.18.2
index 01f4744ec266..95fa9f4642e2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.18.2
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=The Gnome System Monitor
 EAPI=5
 HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/
 IUSE=systemd X
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.12:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.18/gnome-system-monitor-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2b7574f5596086ca9f86549a7ad2afd0
+_md5_=f1f9568c23bf10f4512db8c449db1bd2
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.18.1-r1 b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.18.1-r1
index 3b739edf7d51..285bd035249a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.18.1-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-tweak-tool-3.18.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to customize GNOME 3 options
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.4 >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup[introspection] net-libs/libsoup-gnome[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 gnome-base/gnome-shell >=gnome-base/nautilus-3
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.18/gnome-tweak-tool-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4803a3713535f7f466d57cb3587b4b08
+_md5_=ef1ebab0645c7940c9662a36a54c4e4c
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.18.1 b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.18.1
index 4fcd92140395..1c581623487f 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME end user documentation
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=CC-BY-3.0
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-docs/3.18/gnome-user-docs-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ea8a52e808506f5de6db0a0eca94c282
+_md5_=415d9f271fb7010ff76838a711955ed8
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.0 b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.0
index 090dd97f6d01..92642381d9d4 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.0
+++ b/metadata/md5-cache/gnome-extra/gnome-user-share-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 m
 DESCRIPTION=Personal file sharing for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-user-share
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile,apache2_mpms_prefork] >=x11-libs/libnotify-0.7:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6e3389b0e79b0e718ca20717727f6a5b
+_md5_=b73d384e2d788c6cea30128b5838be66
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-3.18.1 b/metadata/md5-cache/gnome-extra/gnome-weather-3.18.1
index 3287ffdab600..6482ebeb13fe 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=A weather application for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= >=x11-libs/gtk+-3.11.4:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/3.18/gnome-weather-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a0d5b76ec246a8199f07f99b54b2e7c5
+_md5_=2d20d76fd7f83028e2a8d015242f13ea
diff --git a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0 b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
index 3a5ac7e8cc43..6b5eb1ed4044 100644
--- a/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
+++ b/metadata/md5-cache/gnome-extra/gtkhtml-4.10.0
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/e
 DESCRIPTION=Lightweight HTML rendering/printing/editing engine
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gtkhtml
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4
 SLOT=4.0
 SRC_URI=mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=49ef2ca3b74c3c9162423bec320cbf1a
+_md5_=812bece993c40381b0df87dbcd61f81c
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-3.18.2 b/metadata/md5-cache/gnome-extra/gucharmap-3.18.2
index 8f7f6794a071..06b666493e66 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-3.18.2
+++ b/metadata/md5-cache/gnome-extra/gucharmap-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
 IUSE=cjk +introspection test vala debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cc1ae7195f845d73e05477f7dc4099a8
+_md5_=beb5f1716e1788b3c4d97225bb6e2da7
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.4 b/metadata/md5-cache/gnome-extra/libgda-5.2.4
index c237176db657..5e88de34637f 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.4
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=reports? ( python_targets_python2_7 ) canvas? ( gtk ) graphviz? ( g
 RESTRICT=test firebird? ( bindist )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2e67c5aa2f59225f54b1460e5fa9e555
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.4-r1 b/metadata/md5-cache/gnome-extra/libgda-5.2.4-r1
index 0867a3258671..6c0223111b60 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.4-r1
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.4-r1
@@ -4,12 +4,12 @@ DESCRIPTION=GNOME database access library
 EAPI=5
 HOMEPAGE=http://www.gnome-db.org/
 IUSE=berkdb canvas firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala debug elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) reports? ( >=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-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= vala? ( dev-libs/libgee:0.8 ) java? ( >=dev-java/java-config-2.2.0 )
 REQUIRED_USE=reports? ( python_targets_python2_7 ) canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( introspection )
 RESTRICT=test firebird? ( bindist )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a148b507100fbc1f0dbb3d0c79c78f43
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=07300f25678f85c0226898f6e21c3e2f
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.36 b/metadata/md5-cache/gnome-extra/libgsf-1.14.36
index e5ef99e7bc9a..ef79d1b39e2a 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.36
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.36
@@ -4,10 +4,10 @@ DESCRIPTION=The GNOME Structured File Library
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.36.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8c9d06a57727128575baa736ad085d8c
+_md5_=0389929eece0f8063a7e763aac375dd1
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.2-r1 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.2-r1
index deffa6a1eead..b06489ea5392 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.2-r1
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A nautilus extension for sending files to locations
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/nautilus-sendto/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.90.3:3[X(+)]
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=82e62828b507007d3751fa858be60c4c
+_md5_=6d45948c1d33ccf0114e63932f949ae4
diff --git a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.6.1 b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.6.1
index 2beb234a9415..9d819ba30f9c 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.6.1
+++ b/metadata/md5-cache/gnome-extra/nautilus-tracker-tags-1.6.1
@@ -3,10 +3,10 @@ DEPEND=~app-misc/tracker-1.6.1 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90
 DESCRIPTION=Nautilus extension to tag files for Tracker
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=~app-misc/tracker-1.6.1 >=dev-libs/glib-2.38:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
 SLOT=0
 SRC_URI=mirror://gnome/sources/tracker/1.6/tracker-1.6.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bab9b951220113dffce57db98c40f18d
+_md5_=754dae2be6d48a229013b5b4a1a13e5a
diff --git a/metadata/md5-cache/gnome-extra/nemo-2.8.6 b/metadata/md5-cache/gnome-extra/nemo-2.8.6
index ad8cadccec93..89aed16d6815 100644
--- a/metadata/md5-cache/gnome-extra/nemo-2.8.6
+++ b/metadata/md5-cache/gnome-extra/nemo-2.8.6
@@ -4,11 +4,11 @@ DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=exif +introspection +nls packagekit tracker xmp test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
 PDEPEND=>=gnome-base/gvfs-0.1.2
 RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/2.8.6.tar.gz -> nemo-2.8.6.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5d3a9e28d86ecf931881b9b85f6e7b89
+_md5_=292db8d1315373c5d0dabc829bd0d966
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.0.10 b/metadata/md5-cache/gnome-extra/nm-applet-1.0.10
index aecc873da5aa..c0dde6fc5f9b 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.0.10
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.0.10
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME applet for NetworkManager
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=bluetooth +introspection modemmanager
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 PDEPEND=virtual/notification-daemon
 RDEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.0.0[introspection?] net-misc/mobile-broadband-provider-info bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-0.7.990 ) virtual/freedesktop-icon-theme virtual/libgudev:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.0/network-manager-applet-1.0.10.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e2015556d71ba45cfa7680f026fd76f3
+_md5_=cfbdee0284ab20c3a13d9991d4d6065d
diff --git a/metadata/md5-cache/gnome-extra/sushi-3.18.0 b/metadata/md5-cache/gnome-extra/sushi-3.18.0
index 302ba29cbaf4..6a1228bcb8c0 100644
--- a/metadata/md5-cache/gnome-extra/sushi-3.18.0
+++ b/metadata/md5-cache/gnome-extra/sushi-3.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/sushi
 IUSE=office
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.23[introspection] >=dev-libs/gjs-1.40 >=dev-libs/glib-2.29.14:2 >=dev-libs/gobject-introspection-0.9.6:= >=media-libs/clutter-1.11.4:1.0[introspection] >=media-libs/clutter-gtk-1.0.1:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection] >=app-text/evince-3.0[introspection] media-libs/freetype:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/clutter-gst:2.0[introspection] media-libs/musicbrainz:5 net-libs/webkit-gtk:4[introspection] x11-libs/gtksourceview:3.0[introspection] x11-libs/libX11 office? ( app-office/unoconv ) >=gnome-base/nautilus-3.1.90
 SLOT=0
 SRC_URI=mirror://gnome/sources/sushi/3.18/sushi-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=19530ca5172d1fde88d09f88e750438f
+_md5_=3c2642a9529710aacfcf70fe790a8dfa
diff --git a/metadata/md5-cache/gnome-extra/yelp-3.18.1-r1 b/metadata/md5-cache/gnome-extra/yelp-3.18.1-r1
index 6c1d11bcf6da..c7d3a5bdaa0f 100644
--- a/metadata/md5-cache/gnome-extra/yelp-3.18.1-r1
+++ b/metadata/md5-cache/gnome-extra/yelp-3.18.1-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/gl
 DESCRIPTION=Help browser for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.12 >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/gnome-icon-theme-symbolic
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/3.18/yelp-3.18.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ae90bb2bd38eb40454acd75c2e635ea9
+_md5_=1ad02ed0b2eeea189c14575e9d6a8f9a
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-3.18.1 b/metadata/md5-cache/gnome-extra/yelp-xsl-3.18.1
index 270b610830eb..035d15fc3d21 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-3.18.1
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-3.18.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/intltoo
 DESCRIPTION=XSL stylesheets for yelp
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/3.18/yelp-xsl-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aeae574dec77e2c9ebb8cc94a02005e2
+_md5_=fd3d0fe7ac303ff2134e5b79a37524e7
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.18.1.1 b/metadata/md5-cache/gnome-extra/zenity-3.18.1.1
index a8941442c81f..49e148d2d5b0 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.18.1.1
+++ b/metadata/md5-cache/gnome-extra/zenity-3.18.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
 IUSE=libnotify test webkit debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.18/zenity-3.18.1.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2ff1677b401b191ed0916784a60d25ac
+_md5_=5e84a1c6dcea1abe1ed48052cd045279
diff --git a/metadata/md5-cache/gnustep-libs/sqlclient-1.7.0 b/metadata/md5-cache/gnustep-libs/sqlclient-1.7.0
index 90a0ea5e4540..721f57e95596 100644
--- a/metadata/md5-cache/gnustep-libs/sqlclient-1.7.0
+++ b/metadata/md5-cache/gnustep-libs/sqlclient-1.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( virtual/mysql ) postgres? ( de
 REQUIRED_USE=|| ( java mysql postgres sqlite )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/libs/SQLClient-1.7.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnustep-2	eae71f6ebee53a3bf1016938874bca15	gnustep-base	63e3d261394d84127e82e8de711e85a8	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnustep-2	eae71f6ebee53a3bf1016938874bca15	gnustep-base	63e3d261394d84127e82e8de711e85a8	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=567553ddca337d2a79c52b41be157425
diff --git a/metadata/md5-cache/gnustep-libs/sqlclient-1.8.1 b/metadata/md5-cache/gnustep-libs/sqlclient-1.8.1
index e1c40bbfc35d..481a2cbade8e 100644
--- a/metadata/md5-cache/gnustep-libs/sqlclient-1.8.1
+++ b/metadata/md5-cache/gnustep-libs/sqlclient-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( virtual/mysql:= ) postgres? (
 REQUIRED_USE=|| ( java mysql postgres sqlite )
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/libs/SQLClient-1.8.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnustep-2	eae71f6ebee53a3bf1016938874bca15	gnustep-base	63e3d261394d84127e82e8de711e85a8	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnustep-2	eae71f6ebee53a3bf1016938874bca15	gnustep-base	63e3d261394d84127e82e8de711e85a8	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=326923a298ac672f67849cf9013b8a6e
diff --git a/metadata/md5-cache/java-virtuals/ejb-api-0 b/metadata/md5-cache/java-virtuals/ejb-api-0
index 6eb9ef1fd9b7..2edc23139a81 100644
--- a/metadata/md5-cache/java-virtuals/ejb-api-0
+++ b/metadata/md5-cache/java-virtuals/ejb-api-0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-ejb-api:0 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a106e9f572f6150cc7e44dd5c89e8e4
diff --git a/metadata/md5-cache/java-virtuals/interceptor-api-0 b/metadata/md5-cache/java-virtuals/interceptor-api-0
index 127a1373887a..553408ea5a22 100644
--- a/metadata/md5-cache/java-virtuals/interceptor-api-0
+++ b/metadata/md5-cache/java-virtuals/interceptor-api-0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-interceptor-api:0 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7afbb4445f004087231e78abd489ef58
diff --git a/metadata/md5-cache/java-virtuals/jaf-1.1-r1 b/metadata/md5-cache/java-virtuals/jaf-1.1-r1
index 524212ab3f66..0486344fda83 100644
--- a/metadata/md5-cache/java-virtuals/jaf-1.1-r1
+++ b/metadata/md5-cache/java-virtuals/jaf-1.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~a
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/sun-jaf:0 dev-java/gnu-jaf:1 ) >=dev-java/java-config-2.1.8 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85ee4d2dc0c5c330f32217520148ba51
diff --git a/metadata/md5-cache/java-virtuals/javamail-1.0-r4 b/metadata/md5-cache/java-virtuals/javamail-1.0-r4
index 6fb9d973e962..c5e6fddab54f 100644
--- a/metadata/md5-cache/java-virtuals/javamail-1.0-r4
+++ b/metadata/md5-cache/java-virtuals/javamail-1.0-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/oracle-javamail:0 dev-java/sun-javamail:0 dev-java/gnu-javamail:1 ) >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf7c662727327bd06c3b9032aec686a6
diff --git a/metadata/md5-cache/java-virtuals/jaxp-virtual-1.4-r1 b/metadata/md5-cache/java-virtuals/jaxp-virtual-1.4-r1
index 6841c7d86a9e..ceb7ad858d70 100644
--- a/metadata/md5-cache/java-virtuals/jaxp-virtual-1.4-r1
+++ b/metadata/md5-cache/java-virtuals/jaxp-virtual-1.4-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 >=dev-java/jaxp-1.4-r1:0 ) >=dev-java/java-config-2.1.8 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e38682b14b86a82e2357a4a8c421a82
diff --git a/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r3 b/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r3
index 359a8491afcf..9a3c9863d8ef 100644
--- a/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r3
+++ b/metadata/md5-cache/java-virtuals/jdk-with-com-sun-20111111-r3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/icedtea-bin:6 dev-java/icedtea:6 dev-java/icedtea-bin:7 dev-java/icedtea:7 dev-java/oracle-jdk-bin:1.7 dev-java/oracle-jdk-bin:1.8 dev-java/apple-jdk-bin:1.6 dev-java/ibm-jdk-bin:1.6 ) >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fcf4aff5ad0d2d15eef5a4bf2cb96197
diff --git a/metadata/md5-cache/java-virtuals/jms-1.1 b/metadata/md5-cache/java-virtuals/jms-1.1
index edadf4e26eb6..3e867f0176bc 100644
--- a/metadata/md5-cache/java-virtuals/jms-1.1
+++ b/metadata/md5-cache/java-virtuals/jms-1.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/glassfish-jms-api:0 dev-java/sun-jms:0 ) >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4bed4a2753e87d71b0f0b9d98ba0f3c2
diff --git a/metadata/md5-cache/java-virtuals/jmx-1.0-r4 b/metadata/md5-cache/java-virtuals/jmx-1.0-r4
index 243c0db72dc3..a47fe97a67e6 100644
--- a/metadata/md5-cache/java-virtuals/jmx-1.0-r4
+++ b/metadata/md5-cache/java-virtuals/jmx-1.0-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-mac
 LICENSE=public-domain
 RDEPEND=|| ( virtual/jre:1.8 virtual/jre:1.7 virtual/jre:1.6 virtual/jre:1.5 dev-java/sun-jmx:0 ) >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbbee98661b5e6ad48ddac8e2015d206
diff --git a/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3 b/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
index a6bbc8c5d73b..7f807b8ec93d 100644
--- a/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
+++ b/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr67:0 ) >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db3802b4b062d56adb742dc0da8c8865
diff --git a/metadata/md5-cache/java-virtuals/script-api-1.0-r1 b/metadata/md5-cache/java-virtuals/script-api-1.0-r1
index cb4a6cb81beb..9eecaf17947a 100644
--- a/metadata/md5-cache/java-virtuals/script-api-1.0-r1
+++ b/metadata/md5-cache/java-virtuals/script-api-1.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr223:0 ) >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2368cc79c4503a540c36198d16b29fd4
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.2 b/metadata/md5-cache/java-virtuals/servlet-api-2.2
index 8fce4dca02c8..78681d68b54d 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.2
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-mac
 LICENSE=public-domain
 RDEPEND=dev-java/tomcat-servlet-api:2.2 >=dev-java/java-config-2.2.0
 SLOT=2.2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8a323abef03cd9f58fca1c9f534bdac
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.3 b/metadata/md5-cache/java-virtuals/servlet-api-2.3
index 220c7bdf66f9..3ad4c8c1a8e5 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.3
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.3
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-mac
 LICENSE=public-domain
 RDEPEND=dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.2.0
 SLOT=2.3
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53df083f9cc56beb767423afea2f6a82
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.4 b/metadata/md5-cache/java-virtuals/servlet-api-2.4
index 23f4b223e973..39076777ddbd 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.4
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/tomcat-servlet-api:2.4 dev-java/resin-servlet-api:2.4 ) >=dev-java/java-config-2.2.0
 SLOT=2.4
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d32eac40a9e2afce0241fc5abb0b4c1
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1 b/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
index cfe92f8ed9a9..180ae5ba3473 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
+++ b/metadata/md5-cache/java-virtuals/servlet-api-2.5-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/tomcat-servlet-api:2.5 dev-java/resin-servlet-api:2.5 dev-java/glassfish-servlet-api:2.5 ) >=dev-java/java-config-2.2.0
 SLOT=2.5
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a8aa34bc73d6e8f3c3dec80d1d7f574
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1 b/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
index beabcb152d98..016456351ee6 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
+++ b/metadata/md5-cache/java-virtuals/servlet-api-3.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/tomcat-servlet-api:3.0 dev-java/resin-servlet-api:3.0 ) >=dev-java/java-config-2.2.0
 SLOT=3.0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=be0704a7d0c09f3019859ca881121508
diff --git a/metadata/md5-cache/java-virtuals/servlet-api-3.1 b/metadata/md5-cache/java-virtuals/servlet-api-3.1
index 08a2c2d23d08..155793d04fad 100644
--- a/metadata/md5-cache/java-virtuals/servlet-api-3.1
+++ b/metadata/md5-cache/java-virtuals/servlet-api-3.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/tomcat-servlet-api:3.1 dev-java/resin-servlet-api:3.1 ) >=dev-java/java-config-2.2.0
 SLOT=3.1
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0d18781773e6c495d100166080b7759b
diff --git a/metadata/md5-cache/java-virtuals/stax-api-1-r4 b/metadata/md5-cache/java-virtuals/stax-api-1-r4
index 45e4bd3d96a6..4a70bab47124 100644
--- a/metadata/md5-cache/java-virtuals/stax-api-1-r4
+++ b/metadata/md5-cache/java-virtuals/stax-api-1-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr173 ) >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e09f8920c3e5ac004fb1948872cc2bba
diff --git a/metadata/md5-cache/java-virtuals/transaction-api-1.1 b/metadata/md5-cache/java-virtuals/transaction-api-1.1
index 459123dddb10..af8f2176a031 100644
--- a/metadata/md5-cache/java-virtuals/transaction-api-1.1
+++ b/metadata/md5-cache/java-virtuals/transaction-api-1.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 x86 ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/glassfish-transaction-api:0 dev-java/jta:0 ) >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=625dd483e3e46aa60f90ab22636f2a9b
diff --git a/metadata/md5-cache/java-virtuals/xmlrpc-api-0 b/metadata/md5-cache/java-virtuals/xmlrpc-api-0
index 5926bde4292b..1e09955bfdd6 100644
--- a/metadata/md5-cache/java-virtuals/xmlrpc-api-0
+++ b/metadata/md5-cache/java-virtuals/xmlrpc-api-0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-xmlrpc-api:0 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	java-virtuals-2	c53e87cb867e7812d54bdf959c1164e3	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ba71103fa8fd61240738a4567bd78ff
diff --git a/metadata/md5-cache/kde-base/korundum-4.14.3-r1 b/metadata/md5-cache/kde-base/korundum-4.14.3-r1
index 2b95c24ad388..7c2309c1edf0 100644
--- a/metadata/md5-cache/kde-base/korundum-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/korundum-4.14.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/qtruby-4.14.3:4[aqua=,ruby_targets_ruby20] >=kde-base/smokekd
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/korundum-4.14.3.tar.xz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=85a02d3e0d2be3934ce397ffd2f7f13e
diff --git a/metadata/md5-cache/kde-base/krossjava-4.14.3 b/metadata/md5-cache/kde-base/krossjava-4.14.3
index ddbcc47d7c16..189d663d0dff 100644
--- a/metadata/md5-cache/kde-base/krossjava-4.14.3
+++ b/metadata/md5-cache/kde-base/krossjava-4.14.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 !!dev-java/ibm-jdk-bin >=dev-java/java-config-2.2.0 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kross-interpreters-4.14.3.tar.xz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	kde4-meta	c4caa0d8e7fbcd7a667ff9240ef6e96b	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	kde4-meta	c4caa0d8e7fbcd7a667ff9240ef6e96b	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e3c917511b3b2deb8b3066ee84f16bed
diff --git a/metadata/md5-cache/kde-base/krossruby-4.14.3-r1 b/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
index b69fe1977c43..e5383134d23a 100644
--- a/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
+++ b/metadata/md5-cache/kde-base/krossruby-4.14.3-r1
@@ -10,5 +10,5 @@ RDEPEND=kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[ac
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/kross-interpreters-4.14.3.tar.xz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	kde4-meta	c4caa0d8e7fbcd7a667ff9240ef6e96b	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	kde4-meta	c4caa0d8e7fbcd7a667ff9240ef6e96b	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c3896e6d8e1fa2c30c435eab151d87f1
diff --git a/metadata/md5-cache/kde-base/qtruby-4.14.3-r2 b/metadata/md5-cache/kde-base/qtruby-4.14.3-r2
index 12759ab20ddf..830d73e9d363 100644
--- a/metadata/md5-cache/kde-base/qtruby-4.14.3-r2
+++ b/metadata/md5-cache/kde-base/qtruby-4.14.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-base/smokeqt-4.14.3:4[aqua=,declarative?,opengl,phonon?,qscintilla
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=4/4.14
 SRC_URI=mirror://kde/stable/4.14.3/src/qtruby-4.14.3.tar.xz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-utils-2	51a42ff2f35cd75af735cd1626829b06	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	kde4-base	ada7f1c988b3c32e1c9a8168be2731c3	kde4-functions	f6f7b3906630fb197969f914b1ad454a	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1f37101093aea6136b3e183ad4c0c0ad
diff --git a/metadata/md5-cache/mail-client/evolution-3.18.5.1 b/metadata/md5-cache/mail-client/evolution-3.18.5.1
index be1d1f163ff2..70de2ed609bb 100644
--- a/metadata/md5-cache/mail-client/evolution-3.18.5.1
+++ b/metadata/md5-cache/mail-client/evolution-3.18.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=Integrated mail, addressbook and calendaring functionality
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 IUSE=+bogofilter crypt highlight ldap map spamassassin spell ssl +weather
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4 >=app-text/enchant-1.1.7 >=dev-libs/glib-2.40:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.18.2:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.2:3 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) x11-libs/libcryptui ) map? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) spell? ( app-text/gtkspell:3 ) ldap? ( >=net-nds/openldap-2:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.18/evolution-3.18.5.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=db76c1f5939bcefe6942e17c9f0ac39a
+_md5_=aba8606af50d45ed8aebbff38d660342
diff --git a/metadata/md5-cache/mail-filter/dcc-1.3.158 b/metadata/md5-cache/mail-filter/dcc-1.3.158
index 7f65c0941383..abf65fc55d5c 100644
--- a/metadata/md5-cache/mail-filter/dcc-1.3.158
+++ b/metadata/md5-cache/mail-filter/dcc-1.3.158
@@ -4,10 +4,10 @@ DESCRIPTION=Distributed Checksum Clearinghouse
 EAPI=5
 HOMEPAGE=http://www.rhyolite.com/anti-spam/dcc/
 IUSE=cgi ipv6 rrdtool milter
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=DCC GPL-2
 RDEPEND=dev-lang/perl rrdtool? ( net-analyzer/rrdtool ) || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 SLOT=0
 SRC_URI=http://www.rhyolite.com/anti-spam/dcc/source/old/dcc-1.3.158.tar.Z
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f4243430aebd0aabb3b365ce35ecc2e3
+_md5_=4885910e557e905f26ec17c725e4ebeb
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.10 b/metadata/md5-cache/mail-filter/libspf2-1.2.10
index aa5a16fb6787..626c5839c8bb 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.10
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.10
@@ -4,11 +4,11 @@ DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SR
 EAPI=5
 HOMEPAGE=http://www.libspf2.org
 IUSE=static static-libs
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 BSD-2 )
 RDEPEND=!dev-perl/Mail-SPF-Query
 REQUIRED_USE=static? ( static-libs )
 SLOT=0
 SRC_URI=http://www.libspf2.org/spf/libspf2-1.2.10.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f7c70fd8c2ceb68788d2c15782d95eb1
+_md5_=1dbf781e5437f80a575078545ecfee7b
diff --git a/metadata/md5-cache/mail-filter/libsrs_alt-1.0 b/metadata/md5-cache/mail-filter/libsrs_alt-1.0
index 94095264795e..94249dd87f1c 100644
--- a/metadata/md5-cache/mail-filter/libsrs_alt-1.0
+++ b/metadata/md5-cache/mail-filter/libsrs_alt-1.0
@@ -3,10 +3,10 @@ DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-de
 DESCRIPTION=Sender Rewriting Scheme library
 EAPI=0
 HOMEPAGE=http://srs.mirtol.com/
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!dev-perl/Mail-SRS
 SLOT=0
 SRC_URI=http://srs.mirtol.com/libsrs_alt-1.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a08f09b50b2b7683e7f501fb7015eb3e
+_md5_=74e6131e40d4534976d1e91dbd91a02b
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.1 b/metadata/md5-cache/mail-filter/opendmarc-1.3.1
index 1d3f1f5a10f3..0c4a0da396fa 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.1
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Open source DMARC implementation
 EAPI=5
 HOMEPAGE=http://www.trusteddomain.org/opendmarc/
 IUSE=spf
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail ) dev-perl/Switch spf? ( mail-filter/libspf2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.1.tar.gz
 _eclasses_=user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=3806fe726f7d65c5d8476b2958601927
+_md5_=d99a0899edb88b26db63cd6ec400f913
diff --git a/metadata/md5-cache/mail-filter/rmilter-1.7.4 b/metadata/md5-cache/mail-filter/rmilter-1.7.4
new file mode 100644
index 000000000000..5c37666373b8
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/rmilter-1.7.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre dev-libs/openssl:0 mail-filter/libmilter mail-filter/opendkim sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Another sendmail milter for different mail checks
+EAPI=5
+HOMEPAGE=https://github.com/vstakhov/rmilter
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libpcre dev-libs/openssl:0 mail-filter/libmilter mail-filter/opendkim
+SLOT=0
+SRC_URI=https://github.com/vstakhov/rmilter/archive/1.7.4.tar.gz -> rmilter-1.7.4.tar.gz
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=eabb0c434e7f3cb47db720930afb46f0
diff --git a/metadata/md5-cache/mail-filter/rspamd-1.1.4 b/metadata/md5-cache/mail-filter/rspamd-1.1.4
new file mode 100644
index 000000000000..5fe90eac5cd2
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/rspamd-1.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/openssl:0 jit? ( dev-libs/libpcre[jit] dev-lang/luajit:2 ) !jit? ( dev-libs/libpcre[-jit] >=dev-lang/lua-5.1:0 ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmime sys-apps/file virtual/libiconv sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Rapid spam filtering system
+EAPI=5
+HOMEPAGE=https://github.com/vstakhov/rspamd
+IUSE=+jit
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/openssl:0 jit? ( dev-libs/libpcre[jit] dev-lang/luajit:2 ) !jit? ( dev-libs/libpcre[-jit] >=dev-lang/lua-5.1:0 ) dev-libs/libevent dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmime sys-apps/file virtual/libiconv
+SLOT=0
+SRC_URI=https://rspamd.com/downloads/rspamd-1.1.4.tar.xz
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bb5f1ef378a59a2b2e31f79e68d9bc44
diff --git a/metadata/md5-cache/mail-mta/exim-4.86-r2 b/metadata/md5-cache/mail-mta/exim-4.86-r2
index deb1516aa825..3c5d78f3c6ed 100644
--- a/metadata/md5-cache/mail-mta/exim-4.86-r2
+++ b/metadata/md5-cache/mail-mta/exim-4.86-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.exim.org/
 IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2 dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.86.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-html-4.86.tar.bz2 )
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9b7f0b37ab8cc436541c5244f8cb263f
+_md5_=ed64a9ef73dd397cb6e780679889d531
diff --git a/metadata/md5-cache/mail-mta/postfix-3.0.4 b/metadata/md5-cache/mail-mta/postfix-3.0.4
new file mode 100644
index 000000000000..0b881d10987d
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.0.4
@@ -0,0 +1,14 @@
+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 ) virtual/pkgconfig
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=5
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=IBM
+RDEPEND=>=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 ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+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	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	ssl-cert	e90a74de57c48ea6c058b1cb3a735907	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=115549b12ba58c1ad74b8da10eec4434
diff --git a/metadata/md5-cache/mail-mta/postfix-3.2_pre20160221 b/metadata/md5-cache/mail-mta/postfix-3.2_pre20160221
new file mode 100644
index 000000000000..da53d2d71429
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.2_pre20160221
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config 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 ) ) virtual/pkgconfig
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=5
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=IBM
+RDEPEND=>=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 ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.2-20160221.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ac0fbdf472068240481ca4269ef02202
diff --git a/metadata/md5-cache/mate-base/mate-1.10.0-r1 b/metadata/md5-cache/mate-base/mate-1.10.0-r2
similarity index 66%
rename from metadata/md5-cache/mate-base/mate-1.10.0-r1
rename to metadata/md5-cache/mate-base/mate-1.10.0-r2
index cab6f39c9338..118903d00f05 100644
--- a/metadata/md5-cache/mate-base/mate-1.10.0-r1
+++ b/metadata/md5-cache/mate-base/mate-1.10.0-r2
@@ -6,7 +6,7 @@ IUSE=+base -bluetooth +notification +themes +extras
 KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 PDEPEND=notification? ( x11-misc/mate-notification-daemon ) virtual/notification-daemon:0
-RDEPEND==mate-base/mate-desktop-1.10*:0 =mate-base/mate-menus-1.10*:0 =mate-base/mate-panel-1.10*:0 =mate-base/mate-session-manager-1.10*:0 =mate-base/mate-settings-daemon-1.10*:0 =x11-wm/marco-1.10*:0 base? ( =mate-base/caja-1.10*:0 =mate-base/mate-applets-meta-1.10*:0 =mate-base/mate-control-center-1.10*:0 =mate-extra/mate-media-1.10*:0 =x11-misc/mozo-1.10*:0 =x11-terms/mate-terminal-1.10*:0 ) bluetooth? ( net-wireless/blueman:0 ) themes? ( =x11-themes/mate-backgrounds-1.10*:0 =x11-themes/mate-icon-theme-1.10*:0 =x11-themes/mate-themes-1.10*:0 ) extras? ( =app-arch/engrampa-1.10*:0 =app-editors/pluma-1.10*:0 =app-text/atril-1.10*:0 gnome-extra/gnome-calculator:0 =mate-extra/caja-extensions-1.10*:0 =mate-extra/mate-netbook-1.10*:0 =mate-extra/mate-power-manager-1.10*:0 =mate-extra/mate-screensaver-1.10*:0 =mate-extra/mate-system-monitor-1.10*:0 =mate-extra/mate-utils-1.10*:0 =media-gfx/eom-1.10*:0 =net-analyzer/mate-netspeed-1.10*:0 sys-apps/gnome-disk-utility:0 )
+RDEPEND==mate-base/mate-desktop-1.10*:0 =mate-base/mate-menus-1.10*:0 =mate-base/mate-panel-1.10*:0 =mate-base/mate-session-manager-1.10*:0 =mate-base/mate-settings-daemon-1.10*:0 =x11-wm/marco-1.10*:0 base? ( =mate-base/caja-1.10*:0 =mate-base/mate-applets-meta-1.10*:0 =mate-base/mate-control-center-1.10*:0 =mate-extra/mate-media-1.10*:0 =x11-misc/mozo-1.10*:0 =x11-terms/mate-terminal-1.10*:0 ) bluetooth? ( net-wireless/blueman:0 ) themes? ( =x11-themes/mate-backgrounds-1.10*:0 =x11-themes/mate-icon-theme-1.10*:0 =x11-themes/mate-themes-meta-1.10*:0 ) extras? ( =app-arch/engrampa-1.10*:0 =app-editors/pluma-1.10*:0 =app-text/atril-1.10*:0 gnome-extra/gnome-calculator:0 =mate-extra/caja-extensions-1.10*:0 =mate-extra/mate-netbook-1.10*:0 =mate-extra/mate-power-manager-1.10*:0 =mate-extra/mate-screensaver-1.10*:0 =mate-extra/mate-system-monitor-1.10*:0 =mate-extra/mate-utils-1.10*:0 =media-gfx/eom-1.10*:0 =net-analyzer/mate-netspeed-1.10*:0 sys-apps/gnome-disk-utility:0 )
 SLOT=0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ffc5062e8e933d5eca024ada2abefebb
+_md5_=475a12055abb7bfa5607851f99331097
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.0.22 b/metadata/md5-cache/media-fonts/cantarell-0.0.22
index d1648f7e88b2..16129a40d230 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.0.22
+++ b/metadata/md5-cache/media-fonts/cantarell-0.0.22
@@ -4,11 +4,11 @@ DESCRIPTION=Default fontset for GNOME Shell
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=OFL-1.1
 RDEPEND=media-libs/fontconfig
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.22.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	font	cd7790315ca5b8c505e1e0513df6acce	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4c793b300bc24992f736551572980763
+_md5_=afff53248357f92fa5f6983657998583
diff --git a/metadata/md5-cache/media-gfx/aoi-2.5 b/metadata/md5-cache/media-gfx/aoi-2.5
index 776d67d6ad76..df363a8a3b31 100644
--- a/metadata/md5-cache/media-gfx/aoi-2.5
+++ b/metadata/md5-cache/media-gfx/aoi-2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/aoi/aoi25.zip doc? ( mirror://sourceforge/aoi/manual2.3.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d49b531225fa93775a7e31e06862bada
diff --git a/metadata/md5-cache/media-gfx/aoi-2.7.2 b/metadata/md5-cache/media-gfx/aoi-2.7.2
index aeda01fcc361..78416ee47d02 100644
--- a/metadata/md5-cache/media-gfx/aoi-2.7.2
+++ b/metadata/md5-cache/media-gfx/aoi-2.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/aoi/aoi272.zip doc? ( mirror://sourceforge/aoi/manual2.6.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b927bcbad62e80a5728eab73657b66e1
diff --git a/metadata/md5-cache/media-gfx/brlcad-7.18.4 b/metadata/md5-cache/media-gfx/brlcad-7.18.4
index ae415abeb085..b52be06eb3bb 100644
--- a/metadata/md5-cache/media-gfx/brlcad-7.18.4
+++ b/metadata/md5-cache/media-gfx/brlcad-7.18.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2 BSD
 RDEPEND=media-libs/libpng sys-libs/zlib >=sci-libs/tnt-3 sci-libs/jama =dev-tcltk/itcl-3.4* =dev-tcltk/itk-3.4* dev-tcltk/iwidgets dev-tcltk/tkimg dev-tcltk/tkpng sys-libs/libtermcap-compat media-libs/urt x11-libs/libXt x11-libs/libXi java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/brlcad/brlcad-7.18.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=baf616e4e44352d1f6ad5fba7bf7bdb1
diff --git a/metadata/md5-cache/media-gfx/colorhug-client-0.2.8 b/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
index 81b43db8ff93..fab1994f19f0 100644
--- a/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
+++ b/metadata/md5-cache/media-gfx/colorhug-client-0.2.8
@@ -3,11 +3,11 @@ DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.31.10:2 >=dev-libs/libgusb-0.2.2 media-
 DESCRIPTION=Client tools for the ColorHug display colorimeter
 EAPI=5
 HOMEPAGE=http://www.hughski.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.31.10:2 >=dev-libs/libgusb-0.2.2 media-libs/lcms:2 >=media-libs/libcanberra-0.10[gtk3] net-libs/libsoup:2.4 >=x11-libs/gtk+-3.11.2:3 >=x11-misc/colord-1.2.9:0= >=x11-libs/colord-gtk-0.1.24
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~hughsient/releases/colorhug-client-0.2.8.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7a0a667736a426d5f11890b01d08a2f2
+_md5_=9855acff0d356a48f6b763220f1d273e
diff --git a/metadata/md5-cache/media-gfx/eog-3.18.2 b/metadata/md5-cache/media-gfx/eog-3.18.2
index de582b426fc3..9ed6aab332c3 100644
--- a/metadata/md5-cache/media-gfx/eog-3.18.2
+++ b/metadata/md5-cache/media-gfx/eog-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=The Eye of GNOME image viewer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome
 IUSE=+exif +introspection +jpeg lcms +svg tiff xmp debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-libs/gtk+-3.14:3[introspection,X] >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?] x11-libs/libX11 exif? ( >=media-libs/libexif-0.6.14 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( media-libs/exempi:2 )
 REQUIRED_USE=exif? ( jpeg )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/3.18/eog-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9a859179f93aa4302c2aff966d71ec47
+_md5_=2d94ee3b837c7292fd46d13dff3c7b95
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.16.3 b/metadata/md5-cache/media-gfx/eog-plugins-3.16.3
index d382edae2b36..53f8c61ae30f 100644
--- a/metadata/md5-cache/media-gfx/eog-plugins-3.16.3
+++ b/metadata/md5-cache/media-gfx/eog-plugins-3.16.3
@@ -4,11 +4,11 @@ DESCRIPTION=Eye of GNOME plugins
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome/Plugins
 IUSE=+exif +flickr map +picasa +python python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) flickr? ( media-gfx/postr ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( 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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
 REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/eog-plugins/3.16/eog-plugins-3.16.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d206c62ae6370bb7e82489d4718bd2b7
+_md5_=11135ae2e24357527457d64bca5a5cb3
diff --git a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r4 b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r4
index b495db28579f..024ae4080570 100644
--- a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r4
+++ b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew ) virtual/opengl media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey:0= media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-1.22.13.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ee15569d265fdd2244dab35fd8feaec
diff --git a/metadata/md5-cache/media-gfx/freewrl-2.3.3-r1 b/metadata/md5-cache/media-gfx/freewrl-2.3.3-r1
index 7c802ad1d29a..31f5b86e9499 100644
--- a/metadata/md5-cache/media-gfx/freewrl-2.3.3-r1
+++ b/metadata/md5-cache/media-gfx/freewrl-2.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-2.3.3.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1957526254423e9cd65c1077295fa7f
diff --git a/metadata/md5-cache/media-gfx/freewrl-3.0.0 b/metadata/md5-cache/media-gfx/freewrl-3.0.0
index d145ae07e319..ceae2d8a4936 100644
--- a/metadata/md5-cache/media-gfx/freewrl-3.0.0
+++ b/metadata/md5-cache/media-gfx/freewrl-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/freealut media-libs/openal media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/freewrl/freewrl-3.0.0.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a47a56a7ff79c60bf7cf2d9222d27ac
diff --git a/metadata/md5-cache/media-gfx/freewrl-9999 b/metadata/md5-cache/media-gfx/freewrl-9999
index b1d67497f2b7..1bd213717aae 100644
--- a/metadata/md5-cache/media-gfx/freewrl-9999
+++ b/metadata/md5-cache/media-gfx/freewrl-9999
@@ -7,5 +7,5 @@ IUSE=curl debug java libeai motif +nsplugin opencl osc +sox static-libs elibc_Fr
 LICENSE=GPL-3
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/freealut media-libs/openal media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) app-arch/unzip java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mozextension	3d8ee4835f89ff39d4666656aa603433	multilib	3972ca401cf7dbb430df9995f5d8d580	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a47a56a7ff79c60bf7cf2d9222d27ac
diff --git a/metadata/md5-cache/media-gfx/gnome-photos-3.18.2 b/metadata/md5-cache/media-gfx/gnome-photos-3.18.2
index 9ca322f96e07..abf05ac6f6aa 100644
--- a/metadata/md5-cache/media-gfx/gnome-photos-3.18.2
+++ b/metadata/md5-cache/media-gfx/gnome-photos-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Access, organize and share your photos on GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Photos
 IUSE=test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=app-misc/tracker-1:= >=dev-libs/glib-2.39.3:2 gnome-base/gnome-desktop:3= >=gnome-base/librsvg-2.26.0 >=dev-libs/libgdata-0.15.2:0= media-libs/babl >=media-libs/gegl-0.3:0.3 >=media-libs/grilo-0.2.6:0.2 >=media-plugins/grilo-plugins-0.2.6:0.2[upnp-av] >=media-libs/exempi-1.99.5 media-libs/lcms:2 >=media-libs/libexif-0.6.14 >=net-libs/gnome-online-accounts-3.8 >=net-libs/libgfbgraph-0.2.1:0.2 >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.5:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-photos/3.18/gnome-photos-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=83b548d3aba2b7efb864fc7e774d0292
+_md5_=da4a002e4d02ae4b2b413f1a051c1a34
diff --git a/metadata/md5-cache/media-gfx/gnome-screenshot-3.18.0 b/metadata/md5-cache/media-gfx/gnome-screenshot-3.18.0
index 74c1a136ac3e..55feb1acd43c 100644
--- a/metadata/md5-cache/media-gfx/gnome-screenshot-3.18.0
+++ b/metadata/md5-cache/media-gfx/gnome-screenshot-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.35.1:2[dbus] >=media-libs/libcanberra-0.26-r2[gtk3] x11
 DESCRIPTION=Screenshot utility for GNOME
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-screenshot
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.35.1:2[dbus] >=media-libs/libcanberra-0.26-r2[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.0.3:3 x11-libs/libX11 x11-libs/libXext >=gnome-base/gsettings-desktop-schemas-0.1.0 !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-screenshot/3.18/gnome-screenshot-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e57ec2a852e659786309828731e89e14
+_md5_=939ed3957be660611b480248941e09dc
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.9 b/metadata/md5-cache/media-gfx/gphoto2-2.5.9
index 11412c28aefd..3f0f1b1af69e 100644
--- a/metadata/md5-cache/media-gfx/gphoto2-2.5.9
+++ b/metadata/md5-cache/media-gfx/gphoto2-2.5.9
@@ -4,10 +4,10 @@ DESCRIPTION=Free, redistributable digital camera software application
 EAPI=5
 HOMEPAGE=http://www.gphoto.org/
 IUSE=aalib exif ncurses nls readline
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.6[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk ) readline? ( sys-libs/readline:0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.9.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=08647fa2b8e1f204a871dd8938ad8b01
+_md5_=3fcc9cdf614c0ea3964e42c77ab57fcf
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.38.0-r1 b/metadata/md5-cache/media-gfx/graphviz-2.38.0-r1
index 6088470ad4d4..0f39c68baf83 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.38.0-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.38.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_pyth
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.38.0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4581ec16592a10839d77d23489831468
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.17-r1 b/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
similarity index 78%
rename from metadata/md5-cache/media-gfx/llgal-0.13.17-r1
rename to metadata/md5-cache/media-gfx/llgal-0.13.17-r2
index e3df0afff365..fd77d09d5a4c 100644
--- a/metadata/md5-cache/media-gfx/llgal-0.13.17-r1
+++ b/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
@@ -6,8 +6,8 @@ HOMEPAGE=http://home.gna.org/llgal
 IUSE=exif linguas_de linguas_en linguas_it linguas_fr
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=media-gfx/imagemagick dev-perl/ImageSize dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) dev-lang/perl:=[-build(-)]
+RDEPEND=media-gfx/imagemagick dev-perl/Image-Size dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://download.gna.org/llgal/llgal-0.13.17.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=b497e7fe373a6527d6f47fe54b2ee316
+_md5_=807be80f6e53ba75392667772c189acb
diff --git a/metadata/md5-cache/media-gfx/opcion-1.1.1-r2 b/metadata/md5-cache/media-gfx/opcion-1.1.1-r2
index 3748af6708e9..1f2f55efee3f 100644
--- a/metadata/md5-cache/media-gfx/opcion-1.1.1-r2
+++ b/metadata/md5-cache/media-gfx/opcion-1.1.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/jgoodies-looks-1.2* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opcion/Opcion_v1.1.1_src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=43a37b331a7f116c50545019e0f153cc
diff --git a/metadata/md5-cache/media-gfx/plantuml-7999 b/metadata/md5-cache/media-gfx/plantuml-7999
index 673dba6f8c9f..b3ecedfdd21e 100644
--- a/metadata/md5-cache/media-gfx/plantuml-7999
+++ b/metadata/md5-cache/media-gfx/plantuml-7999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=media-gfx/graphviz-2.26.3 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/plantuml/plantuml-7999.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0dbf6824c0662ceae933d7a5547b012
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.18.2 b/metadata/md5-cache/media-gfx/simple-scan-3.18.2
index a23faf788a75..1a48dbb978de 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-3.18.2
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Simple document scanning utility
 EAPI=5
 HOMEPAGE=https://launchpad.net/simple-scan
 IUSE=colord
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgusb[vala] >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= x11-libs/cairo:= >=x11-libs/gtk+-3:3 colord? ( >=x11-misc/colord-0.1.24:=[udev] ) x11-misc/xdg-utils x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=https://launchpad.net/simple-scan/3.18/3.18.2/+download/simple-scan-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=25f3cc485c0eccb6f1cb277f137e2913
+_md5_=204c34db56e9d1895fb4d1f0916c4b8e
diff --git a/metadata/md5-cache/media-libs/clutter-1.24.2 b/metadata/md5-cache/media-libs/clutter-1.24.2
index 55afa779e217..8fa8f486502f 100644
--- a/metadata/md5-cache/media-libs/clutter-1.24.2
+++ b/metadata/md5-cache/media-libs/clutter-1.24.2
@@ -4,11 +4,11 @@ DESCRIPTION=Clutter is a library for creating graphical user interfaces
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Clutter
 IUSE=aqua debug doc egl gtk +introspection test wayland X test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/atk-2.5.3[introspection?] >=dev-libs/json-glib-0.12[introspection?] >=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?] >=x11-libs/cairo-1.14:=[aqua?,glib] >=x11-libs/pango-1.30[introspection?] virtual/opengl x11-libs/libdrm:= egl? ( >=dev-libs/libinput-0.19.0 media-libs/cogl[gles2,kms] >=virtual/libgudev-136 x11-libs/libxkbcommon ) gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) X? ( media-libs/fontconfig >=x11-libs/libX11-1.3.1 x11-libs/libXext x11-libs/libXdamage x11-proto/inputproto >=x11-libs/libXi-1.3 >=x11-libs/libXcomposite-0.4 ) wayland? ( dev-libs/wayland x11-libs/gdk-pixbuf:2 )
 REQUIRED_USE=|| ( aqua wayland X ) wayland? ( egl )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/clutter/1.24/clutter-1.24.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e1df7a5b94bac78a9e3a02ee5c3b38f4
+_md5_=4614b2d8164b017fead26f61a751d64b
diff --git a/metadata/md5-cache/media-libs/clutter-gst-3.0.16 b/metadata/md5-cache/media-libs/clutter-gst-3.0.16
index ec3288e8e350..d1f2c6ac8c30 100644
--- a/metadata/md5-cache/media-libs/clutter-gst-3.0.16
+++ b/metadata/md5-cache/media-libs/clutter-gst-3.0.16
@@ -4,10 +4,10 @@ DESCRIPTION=GStreamer integration library for Clutter
 EAPI=5
 HOMEPAGE=https://blogs.gnome.org/clutter/
 IUSE=X examples +introspection udev debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.20:1.0=[X=,introspection?] >=media-libs/cogl-1.18:1.0=[introspection?] >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8:= ) udev? ( virtual/libgudev ) >=media-libs/gst-plugins-good-1.4:1.0 !udev? ( media-plugins/gst-plugins-v4l2 )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/clutter-gst/3.0/clutter-gst-3.0.16.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ac0643b957cac67bb38dc8cd24383d6e
+_md5_=689e214c9ea284b461668013dad9023a
diff --git a/metadata/md5-cache/media-libs/clutter-gtk-1.6.6-r1 b/metadata/md5-cache/media-libs/clutter-gtk-1.6.6-r1
index 58b4b56c55f6..20b8e54b0f54 100644
--- a/metadata/md5-cache/media-libs/clutter-gtk-1.6.6-r1
+++ b/metadata/md5-cache/media-libs/clutter-gtk-1.6.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library for embedding a Clutter canvas (stage) in GTK+
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Clutter
 IUSE=X examples gtk +introspection wayland debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=x11-libs/gtk+-3.8.0:3[X=,introspection?,wayland=] >=media-libs/clutter-1.23.7:1.0[X=,gtk=,introspection?,wayland=] media-libs/cogl:1.0=[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 SLOT=1.0
 SRC_URI=mirror://gnome/sources/clutter-gtk/1.6/clutter-gtk-1.6.6.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=021d5f42655be337e677f20f1bbfa6ab
+_md5_=827c239d0b1df2cbcbb41b756bb0c274
diff --git a/metadata/md5-cache/media-libs/cogl-1.22.0-r2 b/metadata/md5-cache/media-libs/cogl-1.22.0-r2
index 3940df98b8e6..697d82748646 100644
--- a/metadata/md5-cache/media-libs/cogl-1.22.0-r2
+++ b/metadata/md5-cache/media-libs/cogl-1.22.0-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A library for using 3D graphics hardware to draw pretty pictures
 EAPI=5
 HOMEPAGE=http://www.cogl3d.org/
 IUSE=examples gles2 gstreamer +introspection +kms +opengl +pango test video_cards_fglrx wayland debug test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT BSD
 RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/cairo:= >=x11-libs/gdk-pixbuf-2:2 x11-libs/libX11 >=x11-libs/libXcomposite-0.4 x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXrandr-1.2 virtual/opengl gles2? ( media-libs/mesa[gles2] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) pango? ( >=x11-libs/pango-1.20.0[introspection?] ) wayland? ( >=dev-libs/wayland-1.1.90 media-libs/mesa[egl,wayland] ) !<media-libs/clutter-1.7
 REQUIRED_USE=wayland? ( gles2 ) || ( gles2 opengl )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=1.0/20
 SRC_URI=mirror://gnome/sources/cogl/1.22/cogl-1.22.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=96f163b8763e66cf4465f30626825e64
+_md5_=d26ba1d00b99d8e71fb56908a789ead6
diff --git a/metadata/md5-cache/media-libs/elementary-1.17.0 b/metadata/md5-cache/media-libs/elementary-1.17.0
new file mode 100644
index 000000000000..1f1d517c624d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/elementary-1.17.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=dev-libs/efl-1.17.0[fbcon?,sdl?,png,wayland?,X?] javascript? ( net-libs/nodejs ) doc? ( app-doc/doxygen )
+DESCRIPTION=Basic widget set, based on EFL for mobile touch-screen devices
+EAPI=5
+HOMEPAGE=https://trac.enlightenment.org/e/wiki/Elementary
+IUSE=debug examples fbcon javascript quicklaunch sdl wayland X static-libs nls doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/efl-1.17.0[fbcon?,sdl?,png,wayland?,X?] javascript? ( net-libs/nodejs ) nls? ( sys-devel/gettext )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/elementary/elementary-1.17.0.tar.xz
+_eclasses_=enlightenment	c185b1fa0d87798fd07fb1cd85866b23	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=f2e9948573c813d2ffb8e9eb3ce1ee1e
diff --git a/metadata/md5-cache/media-libs/elementary-9999 b/metadata/md5-cache/media-libs/elementary-9999
index aee7dabb68a1..277d53ffb186 100644
--- a/metadata/md5-cache/media-libs/elementary-9999
+++ b/metadata/md5-cache/media-libs/elementary-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/efl-9999[fbcon?,sdl?,png,wayland?,X?] dev-vcs/git !<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 doc? ( app-doc/doxygen )
+DEPEND=>=dev-libs/efl-9999[fbcon?,sdl?,png,wayland?,X?] javascript? ( net-libs/nodejs ) dev-vcs/git !<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 doc? ( app-doc/doxygen )
 DESCRIPTION=Basic widget set, based on EFL for mobile touch-screen devices
 EAPI=5
 HOMEPAGE=https://trac.enlightenment.org/e/wiki/Elementary
-IUSE=debug examples fbcon quicklaunch sdl wayland X static-libs nls doc
+IUSE=debug examples fbcon javascript quicklaunch sdl wayland X static-libs nls doc
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/efl-9999[fbcon?,sdl?,png,wayland?,X?] nls? ( sys-devel/gettext )
+RDEPEND=>=dev-libs/efl-9999[fbcon?,sdl?,png,wayland?,X?] javascript? ( net-libs/nodejs ) nls? ( sys-devel/gettext )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	enlightenment	c185b1fa0d87798fd07fb1cd85866b23	eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=df7639f3a9f935dda26bf6288d2a1cb6
+_md5_=f2e9948573c813d2ffb8e9eb3ce1ee1e
diff --git a/metadata/md5-cache/dev-perl/HTML-Quoted-0.30.0-r1 b/metadata/md5-cache/media-libs/exiftool-10.11
similarity index 50%
rename from metadata/md5-cache/dev-perl/HTML-Quoted-0.30.0-r1
rename to metadata/md5-cache/media-libs/exiftool-10.11
index e779b79ffbae..820cc4c02b38 100644
--- a/metadata/md5-cache/dev-perl/HTML-Quoted-0.30.0-r1
+++ b/metadata/md5-cache/media-libs/exiftool-10.11
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/HTML-Parser-3.0.0 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Extract structure of quoted HTML mail message
+DEPEND=dev-lang/perl:=[-build(-)]
+DESCRIPTION=Read and write meta information in image, audio and video files
 EAPI=5
-HOMEPAGE=http://search.cpan.org/dist/HTML-Quoted/
-KEYWORDS=~amd64 ~x86
+HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/HTML-Parser-3.0.0 dev-lang/perl:=[-build(-)]
+RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/HTML-Quoted-0.03.tar.gz
+SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.11.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=2d7331e1f2a3cffd6b68811789aa06f8
+_md5_=921cb9b0d243a641302eee34d760e496
diff --git a/metadata/md5-cache/media-libs/grilo-0.2.15 b/metadata/md5-cache/media-libs/grilo-0.2.15
index 7949a61bad6c..d801cd11c3ee 100644
--- a/metadata/md5-cache/media-libs/grilo-0.2.15
+++ b/metadata/md5-cache/media-libs/grilo-0.2.15
@@ -4,11 +4,11 @@ DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=gtk examples +introspection +network playlist test vala
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 net-libs/liboauth gtk? ( >=x11-libs/gtk+-3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9:= ) network? ( >=net-libs/libsoup-2.41.3:2.4 ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
 REQUIRED_USE=test? ( introspection )
 SLOT=0.2/1
 SRC_URI=mirror://gnome/sources/grilo/0.2/grilo-0.2.15.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=505dc2afce4d353b88251cc1ee4d3608
+_md5_=3e5558d1f989bd1a297776b60a43d1b3
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.6.3 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.6.3
index 5532e93d82f0..037db6347408 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.6.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Less plugins for GStreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=X egl gles2 gtk +introspection opengl +orc vcd vnc wayland 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 nls test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3: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(-)?] >=media-libs/gstreamer-1.6.3:1.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.6.3:1.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(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) gles2? ( >=media-libs/mesa-9.1.6[gles2,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(-)?] ) opengl? ( >=media-libs/mesa-9.1.6[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/glu[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(-)?] ) X? ( x11-libs/libX11[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(-)?] ) wayland? ( dev-libs/wayland[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(-)?] ) gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-libs/gst-plugins-good-1.1:1.0 >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 REQUIRED_USE=egl? ( !gles2 ) gles2? ( !egl !opengl ) opengl? ( X ) wayland? ( egl )
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=db57566305c88b186d568873e6cee7c7
+_md5_=75869a4227ef98c69cd9376e141b71d8
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.6.3 b/metadata/md5-cache/media-libs/gst-plugins-base-1.6.3
index 7f80d5b556bb..ac908c6a1aa2 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.6.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=alsa +introspection ivorbis +ogg +orc +pango theora +vorbis 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 nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.34.3: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(-)?] >=media-libs/gstreamer-1.6.3:1.0[introspection?,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(-)?] >=sys-libs/zlib-1.2.8-r1[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(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) ivorbis? ( >=media-libs/tremor-0_pre20130223[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(-)?] ) ogg? ( >=media-libs/libogg-1.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(-)?] ) orc? ( >=dev-lang/orc-0.4.23[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(-)?] ) pango? ( >=x11-libs/pango-1.36.3[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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[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(-)?] ) X? ( >=x11-libs/libX11-1.6.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/libXext-1.3.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/libXv-1.0.10[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d23baea13e4918818ab2d45f043af076
+_md5_=f76de3ae6adaf37ad0c77f8746126df4
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.6.3 b/metadata/md5-cache/media-libs/gst-plugins-good-1.6.3
index f32d933feab8..92711f7b7fe0 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.6.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for GStreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+orc 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 nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.34.3: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(-)?] >=media-libs/gst-plugins-base-1.6.3:1.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(-)?] >=media-libs/gstreamer-1.6.3:1.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(-)?] >=app-arch/bzip2-1.0.6-r4[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(-)?] >=sys-libs/zlib-1.2.8-r1[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(-)?] orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-libs/gst-plugins-bad-1.1:1.0 >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0f818596025c760c27410c56e08dd903
+_md5_=daf392ee546578642bc40a4b47432aee
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.6.3 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.6.3
index 6cf9e6235708..4ac468dfa891 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.6.3
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Basepack of plugins for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+orc 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 nls
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34.3: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(-)?] >=media-libs/gstreamer-1.6.3:1.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(-)?] >=media-libs/gst-plugins-base-1.6.3:1.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(-)?] orc? ( >=dev-lang/orc-0.4.17[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=239aa86b93421c434870fa04642c67f6
+_md5_=51f3223f06eb3a18a5c80c4f70dfad55
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.6.2 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.6.2
index 67c1e3aadb86..7242d5ebff7d 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-1.6.2
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=A GStreamer based RTSP server
 EAPI=5
 HOMEPAGE=http://people.freedesktop.org/~wtay/
 IUSE=examples +introspection static-libs 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 nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32: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(-)?] >=media-libs/gstreamer-1.6.2:1.0[introspection?,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(-)?] >=media-libs/gst-plugins-base-1.6.2:1.0[introspection?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.6.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5137513f3e3eb21b4af5cfe2d60befd7
+_md5_=800272b3d8ebe0725a3af4662d3519a8
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.6.3 b/metadata/md5-cache/media-libs/gstreamer-1.6.3
index 3b7dad2136a6..9604a3e39750 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.6.3
+++ b/metadata/md5-cache/media-libs/gstreamer-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=Open source multimedia framework
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+caps +introspection nls +orc 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3: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(-)?] caps? ( sys-libs/libcap ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.6.3.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=dbf677079b79d23509252c7746de65bc
+_md5_=97a84b9cc561d57aa834d3a190868632
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.6.2 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.6.2
index 604b42fbddd4..5071e54bc744 100644
--- a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.6.2
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=SDK for making video editors and more
 EAPI=5
 HOMEPAGE=http://wiki.pitivi.org/wiki/GES
 IUSE=+introspection
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 >=media-libs/gstreamer-1.6.2:1.0[introspection?] >=media-libs/gst-plugins-base-1.6.2:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) media-libs/gnonlin:1.0
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gstreamer-editing-services/gstreamer-editing-services-1.6.2.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ebdd47f5792b9b6af369a3f139b1d634
+_md5_=bdb48f6a4f8b2b9526e9b56f9e72d3e4
diff --git a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.4 b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.4
index 8ced842709cf..0856a77e7f89 100644
--- a/metadata/md5-cache/media-libs/gupnp-dlna-0.10.4
+++ b/metadata/md5-cache/media-libs/gupnp-dlna-0.10.4
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing DLNA-related functionality for MediaServers
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.5:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/gupnp-dlna/0.10/gupnp-dlna-0.10.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0d4acda89f28812a87ab57ed1182b16d
+_md5_=bf2879b8ecc1a2705a7a4fbf76ae289f
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.1.3 b/metadata/md5-cache/media-libs/harfbuzz-1.1.3
index fbbd45772a00..e1f1a13890c1 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.1.3
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.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(-)?] ) glib? ( >=dev-libs/glib-2.34.3: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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.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(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.1.3.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=84c756ecd4cd4be27dfa37cdba576b16
+_md5_=2ce94d2285fd7ea5fbe83690066af4ab
diff --git a/metadata/md5-cache/media-libs/libbluray-0.6.2 b/metadata/md5-cache/media-libs/libbluray-0.6.2
index 9b3eafc929ec..e647d065f6d3 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.6.2
+++ b/metadata/md5-cache/media-libs/libbluray-0.6.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.6.2/libbluray-0.6.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3225a6f6ec11c1126c63a0ce9a589f8
diff --git a/metadata/md5-cache/media-libs/libbluray-0.8.1 b/metadata/md5-cache/media-libs/libbluray-0.8.1
index aeee45bc36c3..7bdde2d06fa5 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.8.1
+++ b/metadata/md5-cache/media-libs/libbluray-0.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.8.1/libbluray-0.8.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce2d42780cd2c12164a5e02ad1b68688
diff --git a/metadata/md5-cache/media-libs/libbluray-0.9.0 b/metadata/md5-cache/media-libs/libbluray-0.9.0
index 154f3adc9d52..0a563822a9b9 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.9.0
+++ b/metadata/md5-cache/media-libs/libbluray-0.9.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.9.0/libbluray-0.9.0.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce2d42780cd2c12164a5e02ad1b68688
diff --git a/metadata/md5-cache/media-libs/libbluray-0.9.1 b/metadata/md5-cache/media-libs/libbluray-0.9.1
index 918db3c292f0..e764b9a27399 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.9.1
+++ b/metadata/md5-cache/media-libs/libbluray-0.9.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.9.1/libbluray-0.9.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b76b11bce2d68dc1c9f97c395ff0bd9d
diff --git a/metadata/md5-cache/media-libs/libbluray-0.9.2 b/metadata/md5-cache/media-libs/libbluray-0.9.2
index 52d54465eebd..85fac957524a 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.9.2
+++ b/metadata/md5-cache/media-libs/libbluray-0.9.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.9.2/libbluray-0.9.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b76b11bce2d68dc1c9f97c395ff0bd9d
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index 537ef94981a9..736fd50c3279 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -7,5 +7,5 @@ IUSE=aacs bdplus +fontconfig java static-libs +truetype udf utils +xml elibc_Fre
 LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b76b11bce2d68dc1c9f97c395ff0bd9d
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2 b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
index dc7e2351c35b..326f70869f42 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
@@ -10,5 +10,5 @@ RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta18.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mono	3fb22ec265e021c7294a29e720f3d5f7	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mono	3fb22ec265e021c7294a29e720f3d5f7	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0ab48150112f9d03cf93a9166109843d
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
index 4dd8d9a9653f..b66039358d8d 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
@@ -10,5 +10,5 @@ RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6b00841d74852ed6a4b4f371e8dc0a6b
diff --git a/metadata/md5-cache/media-libs/libcdr-0.1.0 b/metadata/md5-cache/media-libs/libcdr-0.1.0
index 40c57edd332e..16fc217b8abb 100644
--- a/metadata/md5-cache/media-libs/libcdr-0.1.0
+++ b/metadata/md5-cache/media-libs/libcdr-0.1.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib dev-libs/boost 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 the Corel cdr documents
 EAPI=5
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libcdr
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.0.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=43eda221a2f4820f748079c826b57f80
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=22e7a8ebc8b305d9c84685b5a1210478
diff --git a/metadata/md5-cache/media-libs/libcdr-0.1.1 b/metadata/md5-cache/media-libs/libcdr-0.1.1
index 1b5b87717e97..3e35a8f6d737 100644
--- a/metadata/md5-cache/media-libs/libcdr-0.1.1
+++ b/metadata/md5-cache/media-libs/libcdr-0.1.1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib dev-libs/boost 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 the Corel cdr documents
 EAPI=5
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libcdr
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.1.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a230c5f935be2c2c0a7836cd0fcea17e
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=16c952b7b4e2f4617461022f31688c16
diff --git a/metadata/md5-cache/media-libs/libcdr-0.1.2 b/metadata/md5-cache/media-libs/libcdr-0.1.2-r1
similarity index 65%
rename from metadata/md5-cache/media-libs/libcdr-0.1.2
rename to metadata/md5-cache/media-libs/libcdr-0.1.2-r1
index dcbc4d0291fe..0beefa7b0183 100644
--- a/metadata/md5-cache/media-libs/libcdr-0.1.2
+++ b/metadata/md5-cache/media-libs/libcdr-0.1.2-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install prepare unpack
+DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
 DESCRIPTION=Library parsing the Corel cdr documents
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libcdr
 IUSE=doc static-libs test
 KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libcdr/libcdr-0.1.2.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ff8abdbb4b66dddd799976e3ea3d16cc
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=51ffd0e916040bd377d1b0294f862153
diff --git a/metadata/md5-cache/media-libs/libcdr-9999 b/metadata/md5-cache/media-libs/libcdr-9999
index 656e269e20fa..bdfe2b13b650 100644
--- a/metadata/md5-cache/media-libs/libcdr-9999
+++ b/metadata/md5-cache/media-libs/libcdr-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) 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 dev-vcs/git
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) 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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Library parsing the Corel cdr documents
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libcdr
 IUSE=doc static-libs test
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge media-libs/lcms:2 sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ff8abdbb4b66dddd799976e3ea3d16cc
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=51ffd0e916040bd377d1b0294f862153
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.12 b/metadata/md5-cache/media-libs/libchamplain-0.12.12
index 87464c8f2dc0..9ddeb8160a12 100644
--- a/metadata/md5-cache/media-libs/libchamplain-0.12.12
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.12
@@ -4,11 +4,11 @@ DESCRIPTION=Clutter based world map renderer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/libchamplain
 IUSE=debug +gtk +introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=media-libs/clutter-1.12:1.0[introspection?] media-libs/cogl:= >=net-libs/libsoup-2.34:2.4 x11-libs/cairo gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0.12
 SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.12.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6e4882b46ea3e5539d39f94ac222abb2
+_md5_=eb9a116f2521fd9d20308b7950d4bf29
diff --git a/metadata/md5-cache/media-libs/libfpx-1.3.1_p6 b/metadata/md5-cache/media-libs/libfpx-1.3.1_p6
index 00ce60871d0d..ffb4f03afa3c 100644
--- a/metadata/md5-cache/media-libs/libfpx-1.3.1_p6
+++ b/metadata/md5-cache/media-libs/libfpx-1.3.1_p6
@@ -3,9 +3,9 @@ DESCRIPTION=A library for manipulating FlashPIX images
 EAPI=6
 HOMEPAGE=http://www.i3a.org/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=Flashpix
 SLOT=0
 SRC_URI=mirror://imagemagick/delegates/libfpx-1.3.1-6.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=78cd951eb2298918de7c8e38da8ef0df
+_md5_=4b3c4aa3a7cd2324a4e09f225d6c9fa9
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.9 b/metadata/md5-cache/media-libs/libgphoto2-2.5.9
index 92abc4f7041e..76ca11a8d697 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.9
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.9
@@ -4,10 +4,10 @@ DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=5
 HOMEPAGE=http://www.gphoto.org/
 IUSE=doc examples exif gd jpeg nls serial cameras_adc65 cameras_agfa_cl20 cameras_aox cameras_ax203 cameras_barbie cameras_canon cameras_casio_qv cameras_clicksmart310 cameras_digigr8 cameras_digita cameras_dimagev cameras_dimera3500 cameras_directory cameras_enigma13 cameras_fuji cameras_gsmart300 cameras_hp215 cameras_iclick cameras_jamcam cameras_jd11 cameras_jl2005a cameras_jl2005c cameras_kodak_dc120 cameras_kodak_dc210 cameras_kodak_dc240 cameras_kodak_dc3200 cameras_kodak_ez200 cameras_konica cameras_konica_qm150 cameras_largan cameras_lg_gsm cameras_mars cameras_mustek cameras_panasonic_coolshot cameras_panasonic_l859 cameras_panasonic_dc1000 cameras_panasonic_dc1580 cameras_pccam300 cameras_pccam600 cameras_pentax cameras_polaroid_pdc320 cameras_polaroid_pdc640 cameras_polaroid_pdc700 cameras_ptp2 cameras_ricoh cameras_ricoh_g3 cameras_samsung cameras_sierra cameras_sipix_blink2 cameras_sipix_web2 cameras_smal cameras_sonix cameras_sony_dscf1 cameras_sony_dscf55 cameras_soundvision cameras_spca50x cameras_sq905 cameras_st2205 cameras_stv0674 cameras_stv0680 cameras_sx330z cameras_toshiba_pdrm11 cameras_topfield cameras_tp6801 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4: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/libltdl: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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,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(-)?] ) jpeg? ( >=virtual/jpeg-0-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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.9.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=bf2c2d69b4ab50058ae5d7e37c1a96c1
+_md5_=33ec55651460501bfa56eaad1aed4d2c
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
index 21807f2ea767..bc5f23106340 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.0.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5381fe0422acc3223da805a015d3250e
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
index d27b16db143b..7e22d3c1dfa7 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=63eebefa3ad1d7a42b1ccb32899c4211
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
index bd0d61de0708..786c4db92478 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=516dd01872120192b76968851d1f2879
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.1
index 4f7deb467926..fe1bc5b798e3 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.1
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.4.1.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9636c72a208764d3bcfdf680026b462b
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.2 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.2
index b8a6e8b75f78..c945f75df0f6 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.2
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.4.2.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e904ef651ead8cda7edf5edf7dc5350c
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.18 b/metadata/md5-cache/media-libs/libpano13-2.9.18
index 709232c48c71..6f0eb87175c4 100644
--- a/metadata/md5-cache/media-libs/libpano13-2.9.18
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng media-libs/tiff sys-libs/zlib virtual/jpeg java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.18.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9a346a119c53a9dbc52710dbdfa36e4
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.19 b/metadata/md5-cache/media-libs/libpano13-2.9.19
index 0940984970ce..8d7607874f5d 100644
--- a/metadata/md5-cache/media-libs/libpano13-2.9.19
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/3
 SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.19.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9668837ff383428b22704fc2dc5bd9da
diff --git a/metadata/md5-cache/media-libs/libvisio-0.1.3 b/metadata/md5-cache/media-libs/libvisio-0.1.3
deleted file mode 100644
index 956d0a8147d7..000000000000
--- a/metadata/md5-cache/media-libs/libvisio-0.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
-DESCRIPTION=Library parsing the visio documents
-EAPI=5
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
-IUSE=doc static-libs test tools
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-SRC_URI=http://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.3.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=10f7bc33201506802206ee3e491d3eb4
diff --git a/metadata/md5-cache/media-libs/libvisio-0.1.3-r1 b/metadata/md5-cache/media-libs/libvisio-0.1.3-r1
index caf1f001874e..5b0071fb804f 100644
--- a/metadata/md5-cache/media-libs/libvisio-0.1.3-r1
+++ b/metadata/md5-cache/media-libs/libvisio-0.1.3-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) 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
 DESCRIPTION=Library parsing the visio documents
 EAPI=5
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.3.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=447dec50057100d1b54289b1624c79be
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=b69d2c3e9dde0da01775e0c838e71a38
diff --git a/metadata/md5-cache/media-libs/libvisio-0.1.5 b/metadata/md5-cache/media-libs/libvisio-0.1.5
new file mode 100644
index 000000000000..de6e6b71634e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libvisio-0.1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-lang/perl >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) 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
+DESCRIPTION=Library parsing the visio documents
+EAPI=6
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
+IUSE=doc static-libs test tools
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
+RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+SLOT=0
+SRC_URI=http://dev-www.libreoffice.org/src/libvisio/libvisio-0.1.5.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=9eed692b95bebee6c48c0e084608b66b
diff --git a/metadata/md5-cache/media-libs/libvisio-9999 b/metadata/md5-cache/media-libs/libvisio-9999
index 5a3770e97a49..d34ad162d54a 100644
--- a/metadata/md5-cache/media-libs/libvisio-9999
+++ b/metadata/md5-cache/media-libs/libvisio-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) 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 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-lang/perl >=dev-libs/boost-1.46 dev-util/gperf sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) 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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Library parsing the visio documents
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libvisio
 IUSE=doc static-libs test tools
 LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=10f7bc33201506802206ee3e491d3eb4
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=8c432fec0133d8f8f0224878984c38bb
diff --git a/metadata/md5-cache/media-libs/mesa-11.1.1 b/metadata/md5-cache/media-libs/mesa-11.1.1
deleted file mode 100644
index 42d3a53f2a44..000000000000
--- a/metadata/md5-cache/media-libs/mesa-11.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/expat-2.1.0-r3:=[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/libX11-1.6.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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[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/libXext-1.3.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/libXxf86vm-1.1.3:=[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/libxcb-1.9.3:=[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/libXfixes:=[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(-)?] llvm? ( !kernel_FreeBSD? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[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/libelf-0.8.13-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(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[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/libelf-0.8.13-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(-)?] ) ) ) ) >=sys-devel/llvm-3.4.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(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc !kernel_FreeBSD? ( || ( >=dev-libs/elfutils-0.155-r1:=[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/libelf-0.8.13-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(-)?] ) ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] ) vaapi? ( >=x11-libs/libva-1.6.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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/libdrm-2.4.64[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.64[video_cards_amdgpu] ) llvm? ( video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) opencl? ( >=sys-devel/llvm-3.4.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(-)?] >=sys-devel/clang-3.4.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(-)?] >=sys-devel/gcc-4.6 ) sys-devel/gettext virtual/pkgconfig >=x11-proto/dri2proto-2.8-r1:=[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(-)?] dri3? ( >=x11-proto/dri3proto-1.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(-)?] >=x11-proto/presentproto-1.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(-)?] ) >=x11-proto/glproto-1.4.17-r1:=[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-proto/xextproto-7.2.1-r1:=[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-proto/xf86driproto-2.1.1-r1:=[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-proto/xf86vidmodeproto-2.3.1-r1:=[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(-)?] !<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=OpenGL-like graphic library for Linux
-EAPI=5
-HOMEPAGE=http://mesa3d.sourceforge.net/
-IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau wayland xvmc xa kernel_FreeBSD 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 udev? ( kernel_linux? ( >=virtual/libudev-215:=[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/expat-2.1.0-r3:=[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/libX11-1.6.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/libxshmfence-1.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(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[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/libXext-1.3.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/libXxf86vm-1.1.3:=[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/libxcb-1.9.3:=[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/libXfixes:=[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(-)?] llvm? ( !kernel_FreeBSD? ( video_cards_radeonsi? ( || ( >=dev-libs/elfutils-0.155-r1:=[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/libelf-0.8.13-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(-)?] ) ) !video_cards_r600? ( video_cards_radeon? ( || ( >=dev-libs/elfutils-0.155-r1:=[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/libelf-0.8.13-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(-)?] ) ) ) ) >=sys-devel/llvm-3.4.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(-)?] ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc !kernel_FreeBSD? ( || ( >=dev-libs/elfutils-0.155-r1:=[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/libelf-0.8.13-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(-)?] ) ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[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(-)?] ) vaapi? ( >=x11-libs/libva-1.6.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) wayland? ( >=dev-libs/wayland-1.2.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[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/libdrm-2.4.64[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,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(-)?] video_cards_i915? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.64[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.64[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.64[video_cards_amdgpu] )
-REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
-RESTRICT=!bindist? ( bindist )
-SLOT=0
-SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/11.1.1/mesa-11.1.1.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a4cd9e06e5a09cf8c6ef2c564622e6a7
diff --git a/metadata/md5-cache/media-libs/mesa-11.1.2 b/metadata/md5-cache/media-libs/mesa-11.1.2-r1
similarity index 99%
rename from metadata/md5-cache/media-libs/mesa-11.1.2
rename to metadata/md5-cache/media-libs/mesa-11.1.2-r1
index 4ceab898451a..af61a2303e5f 100644
--- a/metadata/md5-cache/media-libs/mesa-11.1.2
+++ b/metadata/md5-cache/media-libs/mesa-11.1.2-r1
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/11.1.2/mesa-11.1.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a4cd9e06e5a09cf8c6ef2c564622e6a7
+_md5_=4236a794db70322fbb9768fe647184c5
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.10 b/metadata/md5-cache/media-libs/opencv-2.4.10
index 6b97351d5a51..9e894e8faadb 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.10
+++ b/metadata/md5-cache/media-libs/opencv-2.4.10
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/2.4
 SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/2.4.10/opencv-2.4.10.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb020d43ea63038c3c6a53266d499db3
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.11 b/metadata/md5-cache/media-libs/opencv-2.4.11
index cb3dbe7a70e4..392465e16558 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.11
+++ b/metadata/md5-cache/media-libs/opencv-2.4.11
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/2.4
 SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/2.4.11/opencv-2.4.11.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a03208fce0825d88d8719dd517f8f2d1
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.9 b/metadata/md5-cache/media-libs/opencv-2.4.9
index 3f1204bc4c6e..98f37eea7d8f 100644
--- a/metadata/md5-cache/media-libs/opencv-2.4.9
+++ b/metadata/md5-cache/media-libs/opencv-2.4.9
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/2.4
 SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/2.4.9/opencv-2.4.9.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=24fabe1a3c47d0ccc2d38a6e181fa1e5
diff --git a/metadata/md5-cache/media-libs/opencv-3.0.0 b/metadata/md5-cache/media-libs/opencv-3.0.0
index c77986e628c3..d0e1c7e3385f 100644
--- a/metadata/md5-cache/media-libs/opencv-3.0.0
+++ b/metadata/md5-cache/media-libs/opencv-3.0.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib media-libs/libwebp cuda? ( >=dev-util/nvidi
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) ) ?? ( qt4 qt5 )
 SLOT=0/3.0
 SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/3.0.0/opencv-3.0.0.zip https://github.com/Itseez/opencv/archive/3.0.0.zip -> opencv-3.0.0.zip contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> opencv_contrib.zip )
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61fcde6dabe690f8347e5a9aa03d598d
diff --git a/metadata/md5-cache/media-libs/opencv-3.1.0-r1 b/metadata/md5-cache/media-libs/opencv-3.1.0-r1
index 8e3a5778fdb8..0ae769b328fe 100644
--- a/metadata/md5-cache/media-libs/opencv-3.1.0-r1
+++ b/metadata/md5-cache/media-libs/opencv-3.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) ) ?? ( qt4 qt5 )
 SLOT=0/3.1
 SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/3.1.0/opencv-3.1.0.zip https://github.com/Itseez/opencv/archive/3.1.0.zip -> opencv-3.1.0.zip contrib? ( https://github.com/Itseez/opencv_contrib/archive/3.1.0.zip -> opencv_contrib.zip )
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1dae1942f880240a1f9d676f25bddfb
diff --git a/metadata/md5-cache/media-libs/opencv-3.1.0-r2 b/metadata/md5-cache/media-libs/opencv-3.1.0-r2
new file mode 100644
index 000000000000..a41ce72ff9aa
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencv-3.1.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gphoto2? ( media-libs/libgphoto2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-2.8.12 java? ( >=dev-java/java-config-2.2.0 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
+EAPI=5
+HOMEPAGE=http://opencv.org
+IUSE=contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine 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 elibc_FreeBSD java elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gphoto2? ( media-libs/libgphoto2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) ) ?? ( qt4 qt5 )
+SLOT=0/3.1
+SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/3.1.0/opencv-3.1.0.zip https://github.com/Itseez/opencv/archive/3.1.0.zip -> opencv-3.1.0.zip contrib? ( https://github.com/Itseez/opencv_contrib/archive/3.1.0.zip -> opencv-3.1.0_contrib.zip )
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=08ad41ceeb244f92c9a6d4e7694da85a
diff --git a/metadata/md5-cache/media-libs/portmidi-217 b/metadata/md5-cache/media-libs/portmidi-217
index 696de1bb478b..b9d58a97d030 100644
--- a/metadata/md5-cache/media-libs/portmidi-217
+++ b/metadata/md5-cache/media-libs/portmidi-217
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=media-libs/alsa-lib java? ( >=virtual/jre-1.6 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	distutils	ad9e4720eb3e69090dd968b152fc611b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	distutils	ad9e4720eb3e69090dd968b152fc611b	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c0abaa4d068dce559d14a20e7185516
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r1 b/metadata/md5-cache/media-libs/portmidi-217-r1
index 352b9a689120..ce057cbcbd03 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r1
+++ b/metadata/md5-cache/media-libs/portmidi-217-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/alsa-lib java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c177c828620874bc7eccac9e44a812d3
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r4 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r4
index 3cf04d510b71..568fd8703124 100644
--- a/metadata/md5-cache/media-libs/svgalib-1.9.25-r4
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r4
@@ -10,4 +10,4 @@ RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5fb5cdd24337bbfa7689e2836296b8a6
+_md5_=826ebf1b6208aeb2273e6e6b9a4bc0a4
diff --git a/metadata/md5-cache/media-libs/svgalib-1.9.25-r5 b/metadata/md5-cache/media-libs/svgalib-1.9.25-r5
new file mode 100644
index 000000000000..113aa2de43f6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/svgalib-1.9.25-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=A library for running svga graphics on the console
+EAPI=6
+HOMEPAGE=http://www.svgalib.org/
+IUSE=build +kernel-helper kernel_linux
+KEYWORDS=-* ~x86
+LICENSE=BSD
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://www.arava.co.il/matan/svgalib/svgalib-1.9.25.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=404a0c93288a5605ba046cdf837a072e
diff --git a/metadata/md5-cache/media-plugins/emotion_generic_players-1.17.0 b/metadata/md5-cache/media-plugins/emotion_generic_players-1.17.0
new file mode 100644
index 000000000000..887ed65a39a5
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/emotion_generic_players-1.17.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=dev-libs/efl-1.17.0 media-video/vlc doc? ( app-doc/doxygen )
+DESCRIPTION=Provides external applications as generic loaders for Evas
+EAPI=5
+HOMEPAGE=https://www.enlightenment.org/
+IUSE=nls doc
+KEYWORDS=-alpha ~amd64 ~arm -hppa -ia64 ~mips ~ppc ~ppc64 ~sh -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/efl-1.17.0 media-video/vlc nls? ( sys-devel/gettext )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/emotion_generic_players/emotion_generic_players-1.17.0.tar.xz
+_eclasses_=enlightenment	c185b1fa0d87798fd07fb1cd85866b23	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=a0fce5ed001734e1c9fce9d72b588b56
diff --git a/metadata/md5-cache/media-plugins/evas_generic_loaders-1.17.0 b/metadata/md5-cache/media-plugins/evas_generic_loaders-1.17.0
new file mode 100644
index 000000000000..52c4b7d3262d
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/evas_generic_loaders-1.17.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=dev-libs/efl-1.17.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) pdf? ( app-text/poppler ) postscript? ( app-text/libspectre ) raw? ( media-libs/libraw ) svg? ( gnome-base/librsvg x11-libs/cairo ) doc? ( app-doc/doxygen )
+DESCRIPTION=Provides external applications as generic loaders for Evas
+EAPI=5
+HOMEPAGE=https://www.enlightenment.org/
+IUSE=gstreamer pdf postscript raw svg nls doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/efl-1.17.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) pdf? ( app-text/poppler ) postscript? ( app-text/libspectre ) raw? ( media-libs/libraw ) svg? ( gnome-base/librsvg x11-libs/cairo ) nls? ( sys-devel/gettext )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-1.17.0.tar.xz
+_eclasses_=enlightenment	c185b1fa0d87798fd07fb1cd85866b23	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=84fd42d2740a179ad32dd05d50007ca2
diff --git a/metadata/md5-cache/media-plugins/grilo-plugins-0.2.17 b/metadata/md5-cache/media-plugins/grilo-plugins-0.2.17
index 0a4a2158403f..42241276109b 100644
--- a/metadata/md5-cache/media-plugins/grilo-plugins-0.2.17
+++ b/metadata/md5-cache/media-plugins/grilo-plugins-0.2.17
@@ -4,10 +4,10 @@ DESCRIPTION=A framework for easy media discovery and browsing
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Grilo
 IUSE=daap +dvd flickr freebox gnome-online-accounts lua subtitles thetvdb tracker upnp-av +vimeo +youtube
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=media-libs/grilo-0.2.12:0.2[network,playlist] media-libs/libmediaart:2.0 >=dev-libs/gom-0.3.1 dev-libs/gmime:2.6 dev-libs/json-glib dev-libs/libxml2:2 dev-db/sqlite:3 daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 ) dvd? ( >=dev-libs/totem-pl-parser-3.4.1 ) flickr? ( net-libs/liboauth ) freebox? ( net-dns/avahi ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91 ) lua? ( >=dev-lang/lua-5.3 app-arch/libarchive dev-libs/libxml2:2 >=dev-libs/totem-pl-parser-3.4.1 ) subtitles? ( net-libs/libsoup:2.4 ) thetvdb? ( app-arch/libarchive dev-libs/libxml2 ) tracker? ( >=app-misc/tracker-0.10.5:= ) youtube? ( >=dev-libs/libgdata-0.9.1:= >=dev-libs/totem-pl-parser-3.4.1 ) upnp-av? ( net-libs/libsoup:2.4 net-libs/dleyna-connector-dbus ) vimeo? ( >=dev-libs/totem-pl-parser-3.4.1 )
 SLOT=0.2
 SRC_URI=mirror://gnome/sources/grilo-plugins/0.2/grilo-plugins-0.2.17.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8cc09d2a2193d3ec40e1aa77d3b8fbd6
+_md5_=504e82cdb82e93802698512e9ee02fc9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.6.3
index b34f7d16a293..63ec8e22d6ec 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+orc 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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/a52dec-0.7.4-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(-)?] orc? ( >=dev-lang/orc-0.4.17[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c5c890fb1af5e2e6280b6c5c18f16749
+_md5_=5765df8df0baed2b31b209d54e81f6ca
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.6.3
index bd51d6f266a4..f72fe64c43cf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for AMRNB/AMRWB codec
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1ad1ec6f244c82fdbe167e62a57ceb12
+_md5_=e10a01cb08be3e1fbab5c052fe64187f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.6.3
index 7efe3571e02a..93046ff8ed45 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for ASS/SSA rendering with effects support
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libass-0.10.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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=34496818e716f95a7a68336f736d3ab2
+_md5_=cb44adb0a898b56cf8fb60446497a3e1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.6.3
index 98511fc6d289..46562412feeb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-bluez-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth plugin for GStreamer.
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-wireless/bluez-5[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c98bc9852eb91b14fa227eeb9f780126
+_md5_=68d2a4c4aae64b991eea4eb4c5006832
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.6.3
index 5dbe00af0294..3757ad8d3707 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-0.90-r1:=[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3e253b2dadfc2d47bea33c5750019ef0
+_md5_=2c0e6385751cd113bebad0e7f866fcab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.6.3
index 01da2abca795..fa1b8a208d8c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/cdparanoia-3.10.2-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/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-base-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6ab4ca2c1fe07705a3c1c7af1a0d8b2d
+_md5_=c650b96b93f724c550b3bddd68b3e83b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.6.3
index 7d4ffe8b9787..7b7f84f551c1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=MPEG-DASH plugin
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=53f2983b6187319862b01c428804a56d
+_md5_=198c86130afec82523433a392e3304e1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.6.3
index 511b3c33c405..cdec682b2737 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dtls-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=DTLS plugin for GStreamer.
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/openssl-1.0.1: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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=739dfbb48308b688b9889ac7ad2e8b69
+_md5_=66a1398c17fafa34781e5109f1e19356
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.6.3
index 80590d9cfabe..1e0f612cf177 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for MPEG-1/2 video encoding
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=+orc 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=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdca-0.0.5-r3[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(-)?] orc? ( >=dev-lang/orc-0.4.17[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6c138ced975d5772ce518e97996268ad
+_md5_=88088ec0f9429911744b8f1406cb9daf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.6.3
index 6dc646d44d72..ef1128d1f11a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin to demux and decode DV
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdv-1.0.0-r3[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=730bcb30a5d5396816d2859f6d3b80b4
+_md5_=98a79a18693ad3656eac5f95f5213c74
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.6.3
index ea0c41aee0a8..f917aec7ba95 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e7cd912fef99c8f26c43e5b8056dbbba
+_md5_=62b8ca7f8f447881364e66fc18e849b7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.6.3
index c9ecb505fbdb..c2f3af60fc38 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.2.0-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=64386b312be50b7e797dec686531c0b6
+_md5_=9516160efc2ddf591a1c9e9c2651179a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.6.3
index 95887100493c..cead6003efd3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faac-1.28-r3[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8fdacb9a3bfb5412615229a71e2c8fdb
+_md5_=a482f4d125902d0d1f10ba6e5dcdaeb2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.6.3
index 862adf4a23ce..1708fc8f1cb1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faad2-2.7-r3[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4d7c492d519770f687f68abb5177d616
+_md5_=17237a558da7e6b85bf3d82bb209a970
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.6.3
index 3ba71fdec8e1..d4757527c55f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer encoder/decoder/tagger for FLAC
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/flac-1.2.1-r5[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=eb8804722dfa5c4511895537f28648c9
+_md5_=ba4b135822bc1fdb63de746a93341285
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.6.3
index 25eacb24119f..301a55e6b01c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7: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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8baf09e0a9083fb04fa038e598eba004
+_md5_=88017babef0abd20db5f59213f654945
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.6.3
index 61b00f8a4d9c..75edb05c7bbf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP live streaming plugin
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/nettle: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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=919b258fef11fbaa2c3774686456f599
+_md5_=ca82401edef2631fbea92bc3c08ee8dc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.6.3
index 9c51fda989b2..ac56569bcb41 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/jack-audio-connection-kit-0.121.3-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f20b4fe938a343095aaef6cd8726bc4e
+_md5_=7146cc7d192d732efb152baf0ac938b2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.6.3
index c8cc247a0047..b322929942a5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer encoder/decoder for JPEG format
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/jpeg-0-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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ecb8d1112be4d7a4e2a290baef62a46b
+_md5_=0d4b61bef21016f06462ddc2508008a3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.6.3
index e75a66613eaa..4f6d944f8b73 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/lame-3.99.5-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d9e3ff98efd264f51775deb7ec476a40
+_md5_=f01ec5467915210bf6bcd2928278f6b1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.6.3
index c70581ee1db1..de264f1184ac 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=FFmpeg based gstreamer plugin
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/modules/gst-libav.html
 IUSE=libav +orc 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 app-arch/xz-utils >=media-libs/gstreamer-1.6.3:1.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(-)?] >=media-libs/gst-plugins-base-1.6.3:1.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(-)?] !libav? ( >=media-video/ffmpeg-2.8.5: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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.6.3.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c81a8502746707777ce7f46a92ed5926
+_md5_=ef20d584fd368c6fda0f154d65aa3066
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.6.3
index 7ad6be47e40d..7682006d0f37 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libde265-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=H.265 decoder plugin for GStreamer.
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libde265-0.9[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1e2ae05ebf11057cf2c1877f660da736
+_md5_=9e2129225d666d88435586770d9a2183
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.6.3
index c4497e99e6ce..b5836390eae8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmms-0.6.2-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=de6e542443dae6f76ff4e6025320be22
+_md5_=781d2557dfdbc52de4f86d7b17f97a27
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.6.3
index 5a6968f7e694..a29660666c55 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer encoder/decoder for PNG images
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.6.10: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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f1dd99582078fbd785566d72c6965bd0
+_md5_=cd56236489e90c8b2df0e45044c95dd3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.6.3
index ddbce6903107..c976283abd05 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvisual-0.4.0-r3[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(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-base-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3227d40b52a1935b6c81123eb24b2d12
+_md5_=2a04d7c1c78f83c702a19cd3c30669c1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mad-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-mad-1.6.3
index 498f22b485ae..51948f6e7f7d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mad-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mad-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmad-0.15.1b-r8[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=348074967a50ec11407dd3b4a2844a56
+_md5_=1a531540144c2060870b27263eb314d3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.6.3
index 316dd75ffb95..0b73dbdc1834 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.6.3
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild to pull in gst plugins for apps
 EAPI=5
 HOMEPAGE=https://www.gentoo.org
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.6.3:1.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(-)?] >=media-libs/gst-plugins-base-1.6.3:1.0[alsa?,ogg?,theora?,vorbis?,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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.6.3:1.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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.6.3:1.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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.6.3:1.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(-)?] >=media-plugins/gst-plugins-cdio-1.6.3:1.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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.6.3:1.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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.6.3:1.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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.6.3:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?] >=media-plugins/gst-plugins-a52dec-1.6.3:1.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(-)?] >=media-plugins/gst-plugins-dvdread-1.6.3:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.6.3:1.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(-)?] >=media-plugins/gst-plugins-resindvd-1.6.3:1.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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.6.2:1.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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.6.3:1.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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.6.3:1.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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.6.3:1.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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.6.3:1.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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.6.3:1.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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.6.3:1.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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.6.3:1.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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.6.3:1.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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?] >=media-plugins/gst-plugins-mad-1.6.3:1.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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.6.3:1.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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.6.3:1.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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.6.3:1.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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.6.3:1.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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.6.3:1.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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.6.3:1.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(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-0.6:1.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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.6.3:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.6.3:1.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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.6.3:1.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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.6.3:1.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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.6.3:1.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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=f8ac759b2e8116781346480be9040309
+_md5_=61a9cb2fb5c4ca04c48c7734da4fc779
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.6.3
index ef5cc745da10..a7fe3f5ceef1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=22d64ca60c8c0ff02dc94186be1eb73e
+_md5_=9660c7b622bb7ebf0efe9d15c5b1111b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.6.3
index 7c798b7ec0dc..8ef19d1a5611 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Libmpeg2 based decoder plug-in for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.5.1-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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5fc8888d47685a4c4e8c5eadf07a40e0
+_md5_=61dacf877338ab3607dbc13c490c5f27
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.6.3
index 66ac484027d3..4601a8a5905b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for MPEG-1/2 video encoding
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/mjpegtools-2.1.0-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cbc4f1572bec91adaca061fa16744926
+_md5_=4b4d6a243c8ebb38e6bcc2b6c0f0a8cc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.6.3
index 3dbab74150a6..622700c7fd64 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-video/mjpegtools-2.1.0-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=47e5d8355554d6b93eadf98306ee4b36
+_md5_=0aa771d110b8f567370f02ac188cb190
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.6.3
index af81242bce4f..fc627debd7e7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.30.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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9691226269c01caadd777eecd138261b
+_md5_=55508d14c73a5135f159e6189e4cb3ef
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.6.3
index 4bb5748c8353..2604b3d55742 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libofa-0.9.3-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c669649bc03cedecf91bb98e43240554
+_md5_=a62e9adbf2bb3443dd8859dd15e67a2f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.6.3
index bf29fc410d5f..1ecfac3136f7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openh264-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=H.264 encoder/decoder plugin for GStreamer.
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/openh264-1.3[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6e1399cb6af7223d7392c15f46cb830e
+_md5_=8a92704ad25cd9598d952f9c03b82824
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.6.3
index 514bc9808b96..a66eed6be974 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for Opus audio codec support
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opus-1.0.2-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(-)?] media-libs/gst-plugins-base:1.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(-)?,ogg] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c1d27c7b596d981c27a7bf3ad3927be2
+_md5_=fd0729478cb8ebd1a117cc4035f7fc9f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.6.3
index c4f18f1f3701..286f56cd49c6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for OSS (Open Sound System) support
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=af829f4c4880200ab86afe69a07c372d
+_md5_=291f1e12ec29efa277c89787bfbaf925
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r2 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r2
index 6575f1ce224a..70fe865b91f0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r2
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for the PulseAudio sound server
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-good-0.10:0.10[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(-)?] >=media-sound/pulseaudio-2.1-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[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(-)?] >=media-libs/gst-plugins-good-0.10.31:0.10[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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c332124b26b418a5b83a138b0bfd03e6
+_md5_=235a15fc815061df81f27dec37ade170
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.6.3
index 4ac57b3b2b1b..5bf56cf813ed 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for the PulseAudio sound server
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/pulseaudio-2.1-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ca5c1606976b492507012bf61ef68f13
+_md5_=f92e080585bd27a8526eb4d50eff6645
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.6.3
index 7e15768ff840..ce77d43fa9e7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin to capture firewire video
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libiec61883-1.2.0-r1[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(-)?] >=sys-libs/libraw1394-2.1.0-r1[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(-)?] >=sys-libs/libavc1394-0.5.4-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fd217c009388f1c3c3e94b3d7a5216a2
+_md5_=5bef024bdaf38237444bd44d0c7e9141
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.6.3
index 7b84b0043104..588926c1c63e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[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(-)?] >=media-libs/libdvdread-4.2.0-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e1d16d0676164b86c9984e2240ca8a18
+_md5_=8498bf7d239dbde00e3fade8bb05a847
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.6.3
index b1f64b6be69c..19cc19b5fb25 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for supporting RTMP sources
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/rtmpdump-2.4_p20131018[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=64524042cb4b94ca21f0d930f4b7e005
+_md5_=eb5c6698d90a3bcdacecf55d6b2cb661
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.6.3
index 712f08796a81..c6efe3b3ee65 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/schroedinger-1.0.11-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0c9375fe2edc60dcb454344ca92f4e44
+_md5_=cfd681498c67f5d6a13ee06cbcf66480
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.6.3
index adb573e86442..d58ca2254b2b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin to send data to an icecast server
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libshout-2.3.1-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fc27dcecee492185bd5aebbe38fa96ab
+_md5_=e13e71c5bd259650fbb20fdc5d1b9de3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.6.3
index 0c68635e6f1a..24754e111795 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsidplay-1.36.59-r1: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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=eb1adaad10e13b8c54991c026b33ae42
+_md5_=cf38ecf182b29fe9d212a31d4825ee3b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.6.3
index 3cf3c430a4db..b38f5d6e01da 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=Smooth Streaming plugin
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6b26d5bd288131372da4bf9fa8650015
+_md5_=21c1ef23ac84bb5f4d315f15856523f0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.6.3
index 526bc520d83d..723078c55745 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer elements for beats-per-minute detection and pitch controll
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsoundtouch-1.7.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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2c9eff6b7971406cd45b9751f99591d6
+_md5_=74c998404f914383d072e19c364ab8e3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r2 b/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r2
index 9dcd9a1b20b2..c2c93364d530 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r2
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for HTTP client sources
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.44.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.38.2-r1: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(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[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(-)?] >=media-libs/gst-plugins-good-0.10.31:0.10[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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f0bfee34ad9cb71e439430c80054cc4f
+_md5_=7734ea4e670dbf756e38bb8e3ff327e7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.6.3
index 279bdd96082d..f28cda92d54c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for HTTP client source/sink
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.44.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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=66032647dc59d0d2af2847466b5d6a79
+_md5_=8730965f62f24f9a2af3d6250e7eb5bc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.6.3
index 4835ef1ad354..bf121e339769 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin to allow encoding and decoding of speex
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/speex-1.2_rc1-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=47ff95c8409b029634cb23ece9c1bb5b
+_md5_=1f3a672599fbc69bf110d1214b45f98a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.6.3
index ffbc02e672ac..0eda622d0573 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer taglib based tag handler
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.9.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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f74a604caa7740c92015e5f73b342b71
+_md5_=43d91273e741cfd140a85599a5f8c106
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.6.3
index 0dea25a5d33d..6673e5f7dcb5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/twolame-0.3.13-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d467728c3ede457532ade65d49e401ab
+_md5_=e8a02635db03b3d45c3578de0f4d00dd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.6.3
index 6ca9c3aef04a..583b7d21d863 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=UVC compliant H264 encoding cameras plugin for GStreamer.
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libgudev: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(-)?] virtual/libusb: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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e27ad717668a2380767d52055535ffc9
+_md5_=cc9303c7dce135a79ebc35f525360b44
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.6.3
index 374e354c27ed..049e837e68a3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=udev 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 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libv4l-0.9.5[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(-)?] >=media-libs/gst-plugins-base-1.4:1.0[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(-)?] udev? ( >=virtual/libgudev-208:=[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7c91cedb382ce574906c18fd398f8a9e
+_md5_=5e6ef39a654a2070ee53487fb233c6b3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.7.0 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.7.0
index 3aa9953fddcf..23ffe13ca572 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.7.0
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware accelerated video decoding through VA-API plugin
 EAPI=5
 HOMEPAGE=https://github.com/01org/gstreamer-vaapi
 IUSE=+drm opengl 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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.34.3: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(-)?] >=media-libs/gstreamer-1.6:1.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(-)?] >=media-libs/gst-plugins-base-1.6:1.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(-)?] >=media-libs/gst-plugins-bad-1.6:1.0[opengl?,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/libva-1.4.0[drm?,X?,opengl?,wayland?,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(-)?] drm? ( >=virtual/libudev-208:=[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/libdrm-2.4.46[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(-)?] ) X? ( >=x11-libs/libX11-1.6.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/libXrandr-1.4.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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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/libX11-1.6.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/libXrandr-1.4.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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=|| ( drm opengl wayland X )
 SLOT=1.0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-0.7.0.tar.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=159045734187ab23655b4de0106bd809
+_md5_=0067c9bd0f8562a13198266e16317a98
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.6.3
index 47d04fcd7831..39932432a4ae 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for encoding AAC
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/vo-aacenc-0.1.3[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cda744c069f950972d0b557a4fdc12c4
+_md5_=3d9fc670ab50ca5906545e9e862b43eb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.6.3
index 447b76d71252..39ce43359bc3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for encoding AMR-WB
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=bb530decce9dfdaac765f60bcfc15165
+_md5_=7722b88ad723af2ebdcef639b72235e8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.6.3
index 9715973ec62a..9539bd2234f1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer decoder for vpx video format
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvpx-1.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(-)?] >=dev-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=60e3811aacbd50e955ca01c5c97ef343
+_md5_=729b0f560ea927ff8203c03ba4e1123c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.6.3
index 0d8a4c9d0f55..071d5fd56b23 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer encoder/decoder for wavpack audio format
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-sound/wavpack-4.60.1-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=230ff26480bbc079fd5d21d94e50e438
+_md5_=d3ed21979f9fed274d4d0829bba1e88b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.6.3
index f0b14ed079c2..51b5dd62ab3b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=media-libs/x264-0.0.20130506:=[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-ugly-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ae7ba961ba04bcc84bfcd61d10f7e974
+_md5_=7dce93be367031d5080b8ba22c687bb5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.6.3
index 368397710a57..65c39190ff15 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x265-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x265-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=H.265 encoder plugin for GStreamer.
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/x265[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.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-bad-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=70fcccf39ed4ed2d083163e45951ad22
+_md5_=497267eed2429adb2ce251fd30455505
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r2 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r2
index cd53a373e851..05fea0f40038 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r2
@@ -4,11 +4,11 @@ DESCRIPTION=plugin for gstreamer
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-0.10:0.10[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/libX11-1.6.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/libXdamage-1.1.4-r1[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/libXext-1.3.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/libXfixes-5.0.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(-)?] >=x11-libs/libSM-1.2.1-r1[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.38.2-r1: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(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[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(-)?] >=media-libs/gst-plugins-good-0.10.31:0.10[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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-gstplugins[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6e8c2445c75cadf1371806ed5dec52d1
+_md5_=78f6ed1f5687c20ba8a6cab5c3123f89
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.6.3 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.6.3
index 8ab0066e20f6..86fb6e9839f1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.6.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=GStreamer plugin for X11 video capture stream
 EAPI=5
 HOMEPAGE=http://gstreamer.freedesktop.org/
 IUSE=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=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libX11-1.6.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/libXdamage-1.1.4-r1[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/libXext-1.3.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/libXfixes-5.0.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-libs/glib-2.38.2-r1: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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?] >=media-libs/gst-plugins-good-1.6.3:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.6.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gstreamer	0cf4e9175d71d35b9a2175a482a2c996	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4b2f5b1cea3cc6955e9462c454fd4055
+_md5_=07ce0a6f8d3072215523cfa263076d24
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.26.0_p20130922 b/metadata/md5-cache/media-plugins/mythplugins-0.26.0_p20130922-r1
similarity index 91%
rename from metadata/md5-cache/media-plugins/mythplugins-0.26.0_p20130922
rename to metadata/md5-cache/media-plugins/mythplugins-0.26.0_p20130922-r1
index da306f9ea930..d19777276305 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-0.26.0_p20130922
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.26.0_p20130922-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.26.0_p20130922*:=[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.26.0_p20130922*:=[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Official MythTV plugins
 EAPI=5
 HOMEPAGE=http://www.mythtv.org
 IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather mythzoneminder cdda cdr exif fftw raw
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.26.0_p20130922*:=[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.26.0_p20130922*:=[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythnews? ( mythbrowser ) raw? ( mythgallery )
 SLOT=0
 SRC_URI=ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.26.0.tar.bz2 https://dev.gentoo.org/~rich0/distfiles/mythplugins-0.26.0-9fd7c6102b2cd1a3760337663803b110446c6ea7.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fdafebf1b40b15a3880913065f90c629
+_md5_=58a5a7d31f4f124a0cdc3e3dc1ad04e6
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r1 b/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r3
similarity index 94%
rename from metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r1
rename to metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r3
index d8dce96230f2..4d5e44d5fef0 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r1
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27.5_p20150627*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
+DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27.5_p20150627*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
 DESCRIPTION=Official MythTV plugins
 EAPI=5
 HOMEPAGE=http://www.mythtv.org
 IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather mythzoneminder alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27.5_p20150627*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
+RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27.5_p20150627*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
 REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythmusic? ( vorbis ) mythnews? ( mythbrowser ) raw? ( mythgallery ) mythnetvision? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz https://dev.gentoo.org/~rich0/distfiles/mythplugins-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=df18ce6b214ed1e0ca1742268666baa7
+_md5_=54c0ada5c2a087485c13f7ca9da00dac
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r2 b/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r4
similarity index 95%
rename from metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r2
rename to metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r4
index 86f3ce86d587..2509bb6daf18 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r2
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather >=media-tv/mythtv-0.27:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
+DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather >=media-tv/mythtv-0.27:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
 DESCRIPTION=Official MythTV plugins
 EAPI=5
 HOMEPAGE=http://www.mythtv.org
 IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather mythzoneminder alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid python_targets_python2_7
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather >=media-tv/mythtv-0.27:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
+RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather >=media-tv/mythtv-0.27:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
 REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythmusic? ( vorbis ) mythnews? ( mythbrowser ) raw? ( mythgallery ) mythnetvision? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz https://dev.gentoo.org/~rich0/distfiles/mythplugins-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=dee2ec5e85f0eaa2f71b7f3400da6aae
+_md5_=117e10ab3eab9d0baa71f35ddf62f1c1
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.27_p20140321 b/metadata/md5-cache/media-plugins/mythplugins-0.27_p20140321-r1
similarity index 90%
rename from metadata/md5-cache/media-plugins/mythplugins-0.27_p20140321
rename to metadata/md5-cache/media-plugins/mythplugins-0.27_p20140321-r1
index f51226a6798c..72d41c2c1240 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-0.27_p20140321
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.27_p20140321-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27_p20140321*:=[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27_p20140321*:=[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=Official MythTV plugins
 EAPI=5
 HOMEPAGE=http://www.mythtv.org
 IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather mythzoneminder cdda cdr exif fftw raw
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27_p20140321*:=[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27_p20140321*:=[python] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/libvorbis-1.0:= >=media-libs/taglib-1.6:= media-sound/lame virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) fftw? ( sci-libs/fftw:= ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythnews? ( mythbrowser ) raw? ( mythgallery )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.tar.gz -> mythtv-0.27.tar.gz https://dev.gentoo.org/~rich0/distfiles/mythplugins-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c7bc74368bcf5487f484e130039b88ee
+_md5_=f2cd051838faa1697e7d1075330e3141
diff --git a/metadata/md5-cache/media-sound/ardour-4.7 b/metadata/md5-cache/media-sound/ardour-4.7
new file mode 100644
index 000000000000..4ddf1e24c28f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ardour-4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sci-libs/fftw:3.0 virtual/libusb:0 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) dev-lang/python !dev-lang/python[-threads]
+DESCRIPTION=Digital Audio Workstation
+EAPI=5
+HOMEPAGE=http://ardour.org/
+IUSE=altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/glibmm-2.32.0 >=dev-cpp/gtkmm-2.16:2.4 >=dev-cpp/libgnomecanvasmm-2.26:2.6 dev-libs/boost:= >=dev-libs/glib-2.10.1:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2.6:2 dev-libs/libxslt >=gnome-base/libgnomecanvas-2 media-libs/alsa-lib media-libs/aubio media-libs/flac media-libs/freetype:2 media-libs/libart_lgpl media-libs/liblo >=media-libs/liblrdf-0.4.0-r20 >=media-libs/libsamplerate-0.1 >=media-libs/libsndfile-1.0.18 >=media-libs/libsoundtouch-1.6.0 media-libs/raptor:2 >=media-libs/rubberband-1.6.0 >=media-libs/taglib-1.7 media-libs/vamp-plugin-sdk net-misc/curl sci-libs/fftw:3.0 virtual/libusb:0 x11-libs/cairo >=x11-libs/gtk+-2.8.1:2 x11-libs/pango jack? ( >=media-sound/jack-audio-connection-kit-0.120 ) lv2? ( >=media-libs/slv2-0.6.1 media-libs/lilv media-libs/sratom dev-libs/sord >=media-libs/suil-0.6.10 >=media-libs/lv2-1.4.0 )
+SLOT=4
+SRC_URI=https://github.com/Ardour/ardour/archive/4.7.tar.gz -> ardour-4.7.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	waf-utils	ad1dd5b59c523843eebd3a9934c509ca
+_md5_=768f4ac043a5af4b5d02190fcf1f753a
diff --git a/metadata/md5-cache/media-sound/banshee-2.6.2 b/metadata/md5-cache/media-sound/banshee-2.6.2
index ba5acfcadd06..290ff82c1c8b 100644
--- a/metadata/md5-cache/media-sound/banshee-2.6.2
+++ b/metadata/md5-cache/media-sound/banshee-2.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Import, organize, play, and share your music using a simple and powe
 EAPI=5
 HOMEPAGE=http://banshee.fm/
 IUSE=+aac +cdda +bpm daap doc +encode ipod karma mtp test udev +web youtube
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/mono-2.4.3 <dev-lang/mono-4 gnome-base/gnome-settings-daemon sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12:2 >=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1 >=media-libs/gstreamer-0.10.21-r3:0.10 >=media-libs/gst-plugins-base-0.10.25.2:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-ugly:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 media-plugins/gst-plugins-gio:0.10 >=dev-dotnet/gconf-sharp-2.24.0:2 media-plugins/gst-plugins-gconf:0.10 cdda? ( || ( media-plugins/gst-plugins-cdparanoia:0.10 media-plugins/gst-plugins-cdio:0.10 ) ) media-libs/musicbrainz:3 dev-dotnet/dbus-sharp:1.0 dev-dotnet/dbus-sharp-glib:1.0 >=dev-dotnet/mono-addins-0.6.2[gtk] >=dev-dotnet/taglib-sharp-2.0.3.7 >=dev-db/sqlite-3.4:3 karma? ( >=media-libs/libkarma-0.1.0-r1 ) aac? ( media-plugins/gst-plugins-faad:0.10 ) bpm? ( media-plugins/gst-plugins-soundtouch:0.10 ) daap? ( >=dev-dotnet/mono-zeroconf-0.8.0-r1 ) doc? ( >=app-text/gnome-doc-utils-0.17.3 ) encode? ( media-plugins/gst-plugins-lame:0.10 media-plugins/gst-plugins-taglib:0.10 ) ipod? ( >=media-libs/libgpod-0.8.2[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 >=net-libs/libsoup-gnome-2.26:2.4 ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( app-misc/media-player-info dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp )
 SLOT=0
 SRC_URI=mirror://gnome/sources/banshee/2.6/banshee-2.6.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=82030731dae07d5378576716d04544e6
+_md5_=1641be10081d5cbd6f8966416261f8eb
diff --git a/metadata/md5-cache/media-sound/csound-6.02 b/metadata/md5-cache/media-sound/csound-6.02
index 64b45c3fa49b..ebe303c7a958 100644
--- a/metadata/md5-cache/media-sound/csound-6.02
+++ b/metadata/md5-cache/media-sound/csound-6.02
@@ -11,5 +11,5 @@ REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound6.02.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5b6bebe1281032bf1b67509944d1113
diff --git a/metadata/md5-cache/media-sound/csound-6.04 b/metadata/md5-cache/media-sound/csound-6.04
index 0a37e1cba374..ce263f2dbc1e 100644
--- a/metadata/md5-cache/media-sound/csound-6.04
+++ b/metadata/md5-cache/media-sound/csound-6.04
@@ -11,5 +11,5 @@ REQUIRED_USE=java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( c
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/csound/Csound6.04.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d5806c289ad24329aa2ff195c6dcabc4
diff --git a/metadata/md5-cache/media-sound/csound-6.05.0 b/metadata/md5-cache/media-sound/csound-6.05.0
index 766e167efb7f..9032847f75eb 100644
--- a/metadata/md5-cache/media-sound/csound-6.05.0
+++ b/metadata/md5-cache/media-sound/csound-6.05.0
@@ -11,5 +11,5 @@ REQUIRED_USE=csoundac? ( || ( lua python ) ) java? ( cxx ) linear? ( double-prec
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/csound/csound/archive/6.05.0.tar.gz -> csound-6.05.0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=520b2323b623fff479548208ec0d39f5
diff --git a/metadata/md5-cache/media-sound/entagged-tageditor-0.35 b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
index 0307479d8df6..d35612af8015 100644
--- a/metadata/md5-cache/media-sound/entagged-tageditor-0.35
+++ b/metadata/md5-cache/media-sound/entagged-tageditor-0.35
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 LGPL-2.1 )
 RDEPEND=>=virtual/jre-1.5 dev-java/squareness-jlf dev-db/hsqldb >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/entagged-tageditor-0.35.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f516f2d6838fe59a29ad5ce878ee745a
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.18.2 b/metadata/md5-cache/media-sound/gnome-music-3.18.2
index 27a1e43e78c8..38aaea66bfdb 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.18.2
+++ b/metadata/md5-cache/media-sound/gnome-music-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=Music management for Gnome
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Music
 IUSE=python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=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_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.2.6:0.2[introspection] media-libs/libmediaart:2.0 >=x11-libs/gtk+-3.13.2:3[introspection] app-misc/tracker[introspection(+)] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) dev-python/pygobject:3[cairo,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.2[tracker] x11-misc/xdg-user-dirs
 REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/3.18/gnome-music-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3c4557ca6e7724ac0f61dd863b0a4a9e
+_md5_=e923ae915c744e4350f16c14317c88a2
diff --git a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.18.2-r1 b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.18.2-r1
index b5e580be63a9..8a9b09345c7c 100644
--- a/metadata/md5-cache/media-sound/gnome-sound-recorder-3.18.2-r1
+++ b/metadata/md5-cache/media-sound/gnome-sound-recorder-3.18.2-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/gjs dev-libs/glib:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3
 DESCRIPTION=Simple sound recorder
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/SoundRecorder
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/gjs dev-libs/glib:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.12:3[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sound-recorder/3.18/gnome-sound-recorder-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=74cb13b6e10efe959568cef8609c328b
+_md5_=c3909fc661d0ca14ff3810c5bb6b3cad
diff --git a/metadata/md5-cache/media-sound/jtagger-1.0-r1 b/metadata/md5-cache/media-sound/jtagger-1.0-r1
index 651f9982831f..4513791fcf91 100644
--- a/metadata/md5-cache/media-sound/jtagger-1.0-r1
+++ b/metadata/md5-cache/media-sound/jtagger-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/jlayer:0 >=dev-java/jid3-0.46-r1:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dronten.googlepages.com/jtagger.zip -> jtagger-1.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c4ca2f610c80ee5c00238517883d602
diff --git a/metadata/md5-cache/media-sound/moc-2.6_alpha1-r1 b/metadata/md5-cache/media-sound/moc-2.6_alpha1-r1
index 99ade50867cf..81a2243e6633 100644
--- a/metadata/md5-cache/media-sound/moc-2.6_alpha1-r1
+++ b/metadata/md5-cache/media-sound/moc-2.6_alpha1-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libltdl-2:0 sys-libs/ncurses:0=[unicode?] aac? ( media-libs/f
 SLOT=0
 SRC_URI=http://ftp.daper.net/pub/soft/moc/unstable/moc-2.6-alpha1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4cc574e6e6d161358cc748ac7289108e
+_md5_=c038c6b7e79b018094cb400e5bb751eb
diff --git a/metadata/md5-cache/media-sound/protux-0.50.100 b/metadata/md5-cache/media-sound/protux-0.50.100
index 1cb326dbb0d3..2d156a40f206 100644
--- a/metadata/md5-cache/media-sound/protux-0.50.100
+++ b/metadata/md5-cache/media-sound/protux-0.50.100
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jdk-1.5 source? ( app-arch/zip ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://protux.sourceforge.net/releases/protux-0.50.100.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3d91f9ab7ab132f7b83fe1e16825402
diff --git a/metadata/md5-cache/media-sound/pulseaudio-8.0 b/metadata/md5-cache/media-sound/pulseaudio-8.0
index 4224a79aaf57..a79676b14c4a 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-8.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-8.0
@@ -4,7 +4,7 @@ DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=5
 HOMEPAGE=http://www.pulseaudio.org/
 IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X xen zeroconf 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 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,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(-)?] ) )
 RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[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(-)?] X? ( >=x11-libs/libX11-1.4.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(-)?] >=x11-libs/libxcb-1.6[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/libSM[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/libICE[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/libXtst[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(-)?] ) caps? ( >=sys-libs/libcap-2.22-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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers[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(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( net-wireless/bluez:= >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[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(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) webrtc-aec? ( media-libs/webrtc-audio-processing ) xen? ( app-emulation/xen-tools ) systemd? ( sys-apps/systemd: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-libs/json-c-0.11[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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( net-wireless/bluez:= ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=bluetooth? ( dbus ) ofono-headset? ( bluetooth ) native-headset? (
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-8.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cb4c50a607ccf89b15a8182f577456ca
+_md5_=95b7afc1c5eb7b3d836de13c0a5b8b7e
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.3 b/metadata/md5-cache/media-sound/rhythmbox-3.3
index 5fede040a251..eaa0944da537 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.3
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.3
@@ -4,7 +4,7 @@ DESCRIPTION=Music management and playback software for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
 IUSE=cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av visualizer zeitgeist python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.12.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk,python?] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.34:2.4 media-libs/gst-plugins-base:1.0[introspection] media-libs/gstreamer:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib visualizer? ( >=media-libs/clutter-1.8:1.0 >=media-libs/clutter-gst-1.9.92:2.0 >=media-libs/clutter-gtk-1.0:1.0 >=x11-libs/mx-1.0.1:1.0 media-plugins/gst-plugins-libvisual:1.0 ) cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 media-plugins/gst-plugins-soup:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( >=dev-python/pygobject-3.0:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) udev? ( virtual/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) zeitgeist? ( gnome-extra/zeitgeist ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme upnp-av? ( >=media-libs/grilo-0.2:0.2 >=media-plugins/grilo-plugins-0.2:0.2[upnp-av] ) python? ( >=dev-libs/libpeas-0.7.3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
 REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.3/rhythmbox-3.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f554510abc9e4f6d786f9309e7e4bda6
+_md5_=db2bfb5a374743c5980308ac71a8833d
diff --git a/metadata/md5-cache/media-sound/sound-juicer-3.18.1 b/metadata/md5-cache/media-sound/sound-juicer-3.18.1
index 29778b55ac1a..ea4e05024e1d 100644
--- a/metadata/md5-cache/media-sound/sound-juicer-3.18.1
+++ b/metadata/md5-cache/media-sound/sound-juicer-3.18.1
@@ -4,10 +4,10 @@ DESCRIPTION=CD ripper for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/SoundJuicer
 IUSE=flac test vorbis debug
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.38:2[dbus] >=x11-libs/gtk+-3.4:3 media-libs/libcanberra[gtk3] >=app-cdr/brasero-2.90 sys-apps/dbus gnome-base/gsettings-desktop-schemas media-libs/libdiscid >=media-libs/musicbrainz-5.0.1:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0[vorbis?] flac? ( media-plugins/gst-plugins-flac:1.0 ) gnome-base/gvfs[cdda,udev] || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/sound-juicer/3.18/sound-juicer-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=66c1e3f24a7c73a973f769bdc83e5840
+_md5_=d196d32434711c811d412df2bf5529ae
diff --git a/metadata/md5-cache/media-sound/soundconverter-2.1.6 b/metadata/md5-cache/media-sound/soundconverter-2.1.6
index 908ef45363ec..d858afc9e8c4 100644
--- a/metadata/md5-cache/media-sound/soundconverter-2.1.6
+++ b/metadata/md5-cache/media-sound/soundconverter-2.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=A simple audiofile converter application for the GNOME environment
 EAPI=5
 HOMEPAGE=http://soundconverter.org/
 IUSE=aac flac mp3 opus vorbis python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=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/gconf-python[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/gnome-vfs-python[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/gst-python:0.10[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/pygobject: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/pygtk-2.12[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/libgnome-python[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(+)] gnome-base/libglade[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(+)] aac? ( media-plugins/gst-plugins-faac:0.10 media-plugins/gst-plugins-faad:0.10 ) flac? ( media-plugins/gst-plugins-flac:0.10 ) mp3? ( media-plugins/gst-plugins-lame:0.10 media-plugins/gst-plugins-mad:0.10 media-plugins/gst-plugins-taglib:0.10 ) vorbis? ( media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) opus? ( media-plugins/gst-plugins-opus:0.10 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://launchpad.net/soundconverter/trunk/2.1.6/+download/soundconverter-2.1.6.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=58776d5ad2277a953c974c542e547d43
+_md5_=21ec8548da8e45af2fa7a48482fb058d
diff --git a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1 b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
index b499cfe6bb8a..9919e7ad1566 100644
--- a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
+++ b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/channeleditor/channeleditor_1.9.2.1_src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d937dbb5784679555c1d98379780f5fc
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0-r1 b/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0-r1
index a4ff6c108cf1..e391e13fd58d 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0-r1
+++ b/metadata/md5-cache/media-tv/tvbrowser-3.4.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.1 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/htmlparser-org:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/xalan:0 dev-java/opencsv:0 dev-java/texhyphj:0 dev-java/trident:0 x11-libs/libXt x11-libs/libSM x11-libs/libICE x11-libs/libXext x11-libs/libXtst x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvbrowser/tvbrowser_3.4.1.0_src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d73820ad78bfb09893f8abdca8366a85
diff --git a/metadata/md5-cache/media-tv/tvbrowser-3.4.3 b/metadata/md5-cache/media-tv/tvbrowser-3.4.3
index b565e8446325..419af71cce86 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-3.4.3
+++ b/metadata/md5-cache/media-tv/tvbrowser-3.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.1 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/htmlparser-org:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/xalan:0 dev-java/opencsv:0 dev-java/texhyphj:0 dev-java/trident:0 x11-libs/libXt x11-libs/libSM x11-libs/libICE x11-libs/libXext x11-libs/libXtst x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/tvbrowser/tvbrowser_3.4.3_src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1a3f5070ceb7c22bdc98d5a6835ddd9
diff --git a/metadata/md5-cache/media-tv/tvbrowser-9999-r1 b/metadata/md5-cache/media-tv/tvbrowser-9999-r1
index 441cb2ac60b0..6618641038df 100644
--- a/metadata/md5-cache/media-tv/tvbrowser-9999-r1
+++ b/metadata/md5-cache/media-tv/tvbrowser-9999-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/bsh:0 dev-java/commons-codec:0 dev-java/commons-lang:3.3 dev-java/commons-net:0 dev-java/jakarta-oro:2.0 dev-java/jgoodies-common:1.8 dev-java/jgoodies-forms:1.8 dev-java/jgoodies-looks:2.6 dev-java/l2fprod-common:0 dev-java/log4j:0 dev-java/skinlf:0 dev-java/swt:4.2 dev-java/xalan:0 x11-libs/libXt:0 x11-libs/libSM:0 x11-libs/libICE:0 x11-libs/libXext:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/libXau:0 x11-libs/libXdmcp:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=themes? ( http://javootoo.l2fprod.com/plaf/skinlf/themepacks/BeOSthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/amarachthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/aquathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/architectOlivethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumiErgothempack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/b0sumithemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/bbjthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beigeazulthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/beosthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueMetalthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/blueTurquesathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cellshadedthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/chaNinja-Bluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/coronaHthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/cougarthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/crystal2themepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/fatalEthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gfxOasisthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/gorillathemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/hmmXPMonoBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/iBarthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/macosthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/midnightthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/mmMagra-Xthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/modernthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/oliveGreenLunaXPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusLunaSilverthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSDeepthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/opusOSOlivethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/quickSilverRthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBluethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueBrownthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/roueGreenthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/royalInspiratthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/silverLunaXPthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/solunaRthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerGraphitethemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/tigerthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/toxicthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/underlingthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/whistlerthemepack.zip http://javootoo.l2fprod.com/plaf/skinlf/themepacks/xplunathemepack.zip http://tvbrowser.org/downloads/noia.zip http://tvbrowser.org/downloads/nuvola.zip http://tvbrowser.org/downloads/tulliana.zip http://tvbrowser.org/downloads/tango_without_heart.zip )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=efecbe70097847d11455f411c1587a3a
diff --git a/metadata/md5-cache/media-tv/xawtv-3.95-r3 b/metadata/md5-cache/media-tv/xawtv-3.95-r3
deleted file mode 100644
index e5be06cac9ac..000000000000
--- a/metadata/md5-cache/media-tv/xawtv-3.95-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=sys-libs/ncurses-5.1 virtual/jpeg:0 X? ( x11-libs/libFS x11-libs/libXmu x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXext x11-libs/libXrender xext? ( x11-libs/libXinerama x11-libs/libXxf86dga x11-libs/libXrandr x11-libs/libXxf86vm ) x11-apps/xset xv? ( x11-libs/libXv ) ) motif? ( >=x11-libs/motif-2.3:0 app-text/recode ) alsa? ( media-libs/alsa-lib ) aalib? ( media-libs/aalib ) dv? ( media-libs/libdv ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl ) quicktime? ( media-libs/libquicktime ) zvbi? ( media-libs/zvbi media-libs/libpng:0 ) X? ( x11-apps/xset x11-apps/bdftopcf x11-proto/videoproto xext? ( x11-proto/xineramaproto ) ) X? ( x11-apps/mkfontdir media-fonts/encodings ) !<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=Small suite of video4linux related software
-EAPI=5
-HOMEPAGE=http://bytesex.org/xawtv/
-IUSE=aalib alsa dv lirc cpu_flags_x86_mmx motif nls opengl quicktime X xv zvbi xext X
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.1 virtual/jpeg:0 X? ( x11-libs/libFS x11-libs/libXmu x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXext x11-libs/libXrender xext? ( x11-libs/libXinerama x11-libs/libXxf86dga x11-libs/libXrandr x11-libs/libXxf86vm ) x11-apps/xset xv? ( x11-libs/libXv ) ) motif? ( >=x11-libs/motif-2.3:0 app-text/recode ) alsa? ( media-libs/alsa-lib ) aalib? ( media-libs/aalib ) dv? ( media-libs/libdv ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl ) quicktime? ( media-libs/libquicktime ) zvbi? ( media-libs/zvbi media-libs/libpng:0 )
-SLOT=0
-SRC_URI=http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz X? ( http://dl.bytesex.org/releases/tv-fonts/tv-fonts-1.1.tar.bz2 ) mirror://gentoo/xawtv-patches-4.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	font	cd7790315ca5b8c505e1e0513df6acce	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d3d58d79be74aac9367c46d2d37abf35
diff --git a/metadata/md5-cache/media-video/aacskeys-0.4.0c-r2 b/metadata/md5-cache/media-video/aacskeys-0.4.0c-r2
index 0f86fb9d0dc0..881d67ebb02a 100644
--- a/metadata/md5-cache/media-video/aacskeys-0.4.0c-r2
+++ b/metadata/md5-cache/media-video/aacskeys-0.4.0c-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/openssl[-bindist] >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://bluray.beandog.org/aacskeys/aacskeys-0.4.0c.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb9868766fe29593def142fa17e0867f
diff --git a/metadata/md5-cache/media-video/aacskeys-0.4.0e b/metadata/md5-cache/media-video/aacskeys-0.4.0e
index f7a21f7916d4..6dae26e54619 100644
--- a/metadata/md5-cache/media-video/aacskeys-0.4.0e
+++ b/metadata/md5-cache/media-video/aacskeys-0.4.0e
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/openssl[-bindist] >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://bluray.beandog.org/aacskeys/aacskeys-0.4.0e.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=efb2c8a0b07acd5442f5974d2ddd23f9
diff --git a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1 b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
index 8bf35beade91..5bfe26f90310 100644
--- a/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
+++ b/metadata/md5-cache/media-video/bdsup2sub-4.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://sbriesen.de/gentoo/distfiles/bdsup2sub-4.0.0.tar.xz http://sbriesen.de/gentoo/distfiles/xdg-20100731.java.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a0352e848034e5f05a378f76314fa9c
diff --git a/metadata/md5-cache/media-video/cheese-3.18.1-r1 b/metadata/md5-cache/media-video/cheese-3.18.1-r1
index 9342d5d88cb0..c14621291d98 100644
--- a/metadata/md5-cache/media-video/cheese-3.18.1-r1
+++ b/metadata/md5-cache/media-video/cheese-3.18.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A cheesy program to take pictures and videos from your webcam
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Cheese
 IUSE=+introspection test test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.39.90:2 >=x11-libs/gtk+-3.13.4:3[introspection?] >=gnome-base/gnome-desktop-2.91.6:3= >=media-libs/libcanberra-0.26[gtk3] >=media-libs/clutter-1.13.2:1.0[introspection?] >=media-libs/clutter-gtk-0.91.8:1.0 media-libs/clutter-gst:3.0 media-libs/cogl:1.0=[introspection?] media-video/gnome-video-effects x11-libs/gdk-pixbuf:2[jpeg,introspection?] x11-libs/libX11 x11-libs/libXtst media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X] virtual/libgudev:= introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=media-libs/gst-plugins-bad-1.4:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-v4l2:1.0 media-plugins/gst-plugins-vpx:1.0
 SLOT=0/8
 SRC_URI=mirror://gnome/sources/cheese/3.18/cheese-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2e3c5c7c0e7d92c733f65f3fdcbcbc08
+_md5_=f4117f3b2860edd7399dbba217f4cd21
diff --git a/metadata/md5-cache/media-video/google2srt-0.5.6-r1 b/metadata/md5-cache/media-video/google2srt-0.5.6-r1
index 1c99a49cd3f6..5cc8afc171dc 100644
--- a/metadata/md5-cache/media-video/google2srt-0.5.6-r1
+++ b/metadata/md5-cache/media-video/google2srt-0.5.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/jdom:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/google2srt/Google2SRT-0.5.6.zip http://sbriesen.de/gentoo/distfiles/google2srt-icon.png
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=527672577b13a5b9de9e470709da4db6
diff --git a/metadata/md5-cache/media-video/jubler-4.6.1-r3 b/metadata/md5-cache/media-video/jubler-4.6.1-r3
index b22fb8e6f1f1..11e936e60a37 100644
--- a/metadata/md5-cache/media-video/jubler-4.6.1-r3
+++ b/metadata/md5-cache/media-video/jubler-4.6.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 virtual/ffmpeg mplayer? ( media-video/mplayer[libass] ) spell? ( app-text/aspell >=dev-java/zemberek-2.0[linguas_tr] ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://jubler.googlecode.com/files/Jubler-source-4.6.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4dd3d7378db0b3feca4c9b59c6e9cf70
diff --git a/metadata/md5-cache/media-video/movit-1.3.1 b/metadata/md5-cache/media-video/movit-1.3.1-r1
similarity index 67%
rename from metadata/md5-cache/media-video/movit-1.3.1
rename to metadata/md5-cache/media-video/movit-1.3.1-r1
index 84122994ec2a..7bd16d0ce399 100644
--- a/metadata/md5-cache/media-video/movit-1.3.1
+++ b/metadata/md5-cache/media-video/movit-1.3.1-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile test
+DEFINED_PHASES=compile prepare test
 DEPEND=media-libs/mesa >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
 DESCRIPTION=Modern Video Toolkit
 EAPI=5
@@ -9,4 +9,5 @@ RDEPEND=media-libs/mesa >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy sci-libs/fft
 RESTRICT=test
 SLOT=0
 SRC_URI=http://movit.sesse.net/movit-1.3.1.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
-_md5_=22fa3897d57d355e5af34854391b9851
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=42d55ee641e1930249d0c01298c082b6
diff --git a/metadata/md5-cache/media-video/pitivi-0.95 b/metadata/md5-cache/media-video/pitivi-0.95
index 370f078323c2..e0b645ef5fd0 100644
--- a/metadata/md5-cache/media-video/pitivi-0.95
+++ b/metadata/md5-cache/media-video/pitivi-0.95
@@ -4,11 +4,11 @@ DESCRIPTION=A non-linear video editor using the GStreamer multimedia framework
 EAPI=5
 HOMEPAGE=http://www.pitivi.org
 IUSE=v4l test python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite] ) python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pycairo-1.10[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=x11-libs/cairo-1.10 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/gst-python-1.4:1.0[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/matplotlib[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/numpy[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pycanberra[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pygobject-3.8:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pyxdg[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] gnome-base/librsvg:= gnome-base/gnome-desktop:3=[introspection] >=media-libs/gstreamer-1.6.0:1.0[introspection] >=media-libs/gstreamer-editing-services-1.6.0:1.0[introspection] >=media-libs/gst-plugins-base-1.6.0:1.0 >=media-libs/gst-plugins-bad-1.6.1:1.0[gtk] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-plugins/gst-plugins-libav-1.6.0:1.0 x11-libs/libnotify[introspection] >=x11-libs/gtk+-3.10.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.4:1.0 )
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pitivi/0.95/pitivi-0.95.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=54e50fc4dc81274aad63f5c2ac73a028
+_md5_=e3c84da839d0127f951c66357109fe14
diff --git a/metadata/md5-cache/media-video/projectx-0.91.0.10 b/metadata/md5-cache/media-video/projectx-0.91.0.10
index 4c89e17daf46..5d7533fa96b3 100644
--- a/metadata/md5-cache/media-video/projectx-0.91.0.10
+++ b/metadata/md5-cache/media-video/projectx-0.91.0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-net X? ( =dev-java/browserlauncher2-1* ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~billie/distfiles/projectx-0.91.0.10.tar.xz http://sbriesen.de/gentoo/distfiles/projectx-idctfast.tar.xz http://sbriesen.de/gentoo/distfiles/xdg-20100731.java.xz http://sbriesen.de/gentoo/distfiles/projectx-icon.png
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53b7f5f3b28b117a2a41750af480f282
diff --git a/metadata/md5-cache/media-video/snappy-1.0-r1 b/metadata/md5-cache/media-video/snappy-1.0-r1
index 79adf257378d..89582955469c 100644
--- a/metadata/md5-cache/media-video/snappy-1.0-r1
+++ b/metadata/md5-cache/media-video/snappy-1.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.32:2 >=media-libs/clutter-1.20.0:1.0 media-libs/clutter
 DESCRIPTION=A simple media player written using GStreamer and Clutter
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Snappy
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 >=media-libs/clutter-1.20.0:1.0 media-libs/clutter-gst:3.0 >=media-libs/clutter-gtk-1.6.0:1.0 >=x11-libs/gtk+-3.5.0:3 x11-libs/libXtst >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-base-1.4.0:1.0 media-plugins/gst-plugins-meta:1.0 !!<net-misc/spice-gtk-0.19
 SLOT=0
 SRC_URI=mirror://gnome/sources/snappy/1.0/snappy-1.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e3d4a81ccb1dd0f421382b482c7b597a
+_md5_=d70af72786f1aa530c58fe13694b3f39
diff --git a/metadata/md5-cache/media-video/subtitleeditor-0.52.1 b/metadata/md5-cache/media-video/subtitleeditor-0.52.1
index fbc4c0a7434b..155ed367ad18 100644
--- a/metadata/md5-cache/media-video/subtitleeditor-0.52.1
+++ b/metadata/md5-cache/media-video/subtitleeditor-0.52.1
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+3 subtitle editing tool
 EAPI=5
 HOMEPAGE=http://home.gna.org/subtitleeditor/
 IUSE=debug nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-text/enchant-1.4 app-text/iso-codes >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-3.18:3.0 >=dev-cpp/gstreamermm-1.0:1.0 >=dev-cpp/libxmlpp-2.40:2.6 dev-libs/glib:2 >=dev-libs/libsigc++-2.6:2 media-libs/gst-plugins-base:1.0[X,pango] media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-plugins/gst-plugins-meta:1.0 x11-libs/gtk+:3 virtual/libintl
 SLOT=0
 SRC_URI=http://download.gna.org/subtitleeditor/0.52/subtitleeditor-0.52.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4431ae5f611a3f3a2deb817c1aaf4298
+_md5_=0d0c3798a2aab30e5730986059ec078d
diff --git a/metadata/md5-cache/media-video/totem-3.18.1 b/metadata/md5-cache/media-video/totem-3.18.1
index dfd70cb294fc..39e41128bdc2 100644
--- a/metadata/md5-cache/media-video/totem-3.18.1
+++ b/metadata/md5-cache/media-video/totem-3.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=Media player for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Videos
 IUSE=+introspection lirc nautilus +python test zeitgeist debug python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.35:2[dbus] >=dev-libs/libpeas-1.1[gtk] >=dev-libs/libxml2-2.6:2 >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=x11-libs/cairo-1.14 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16:3[introspection?] >=media-libs/grilo-0.2.12:0.2[playlist] media-plugins/grilo-plugins:0.2 >=media-libs/gstreamer-1.3.1:1.0 >=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-libs/libX11 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas x11-themes/gnome-icon-theme-symbolic introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=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-libs/libpeas-1.1.0[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/pygobject-2.90.3:3[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/pyxdg[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/dbus-python[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(+)] >=x11-libs/gtk+-3.5.2:3[introspection] ) zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
 REQUIRED_USE=python? ( introspection python_targets_python2_7 ) zeitgeist? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/3.18/totem-3.18.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7813d0a729edd9b7a4da13acdae635d4
+_md5_=578bdbf9c4be78cbde6a78cfce7cce30
diff --git a/metadata/md5-cache/media-video/vlc-2.2.1-r1 b/metadata/md5-cache/media-video/vlc-2.2.1-r1
index efd2d5535bd4..df09543b0ce7 100644
--- a/metadata/md5-cache/media-video/vlc-2.2.1-r1
+++ b/metadata/md5-cache/media-video/vlc-2.2.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare setup test unpack
-DEPEND=!<media-video/ffmpeg-1.2:0 dev-libs/libgpg-error:0 net-dns/libidn:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-11:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( >=dev-libs/fribidi-0.10.4:0 ) bluray? ( >=media-libs/libbluray-0.3:0 ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= sys-libs/zlib:0 ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 ) rdp? ( >=net-misc/freerdp-1.0.1:0=[client] ) samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] ) >=net-fs/samba-4.0.0_alpha1:0[client] ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( media-libs/speex:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) vdpau? ( >=x11-libs/libvdpau-0.6:0 !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( >=media-libs/libvorbis-1.1:0 ) vpx? ( media-libs/libvpx:0 ) X? ( x11-libs/libX11:0 ) x264? ( >=media-libs/x264-0.0.20090923:0= ) x265? ( media-libs/x265:0= ) xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 ) xml? ( >=dev-libs/libxml2-2.5:2 ) zvbi? ( >=media-libs/zvbi-0.2.25:0 ) kde? ( >=kde-base/kdelibs-4:4 ) xcb? ( x11-proto/xproto:0 ) app-arch/xz-utils:0 x86? ( dev-lang/yasm:* ) amd64? ( dev-lang/yasm:* ) >=sys-devel/gettext-0.18.3:* 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=!>=media-video/ffmpeg-3.0:0 dev-libs/libgpg-error:0 net-dns/libidn:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-11:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( >=dev-libs/fribidi-0.10.4:0 ) bluray? ( >=media-libs/libbluray-0.3:0 ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= sys-libs/zlib:0 ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 ) rdp? ( >=net-misc/freerdp-1.0.1:0=[client] ) samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] ) >=net-fs/samba-4.0.0_alpha1:0[client] ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( media-libs/speex:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) vdpau? ( >=x11-libs/libvdpau-0.6:0 !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( >=media-libs/libvorbis-1.1:0 ) vpx? ( media-libs/libvpx:0 ) X? ( x11-libs/libX11:0 ) x264? ( >=media-libs/x264-0.0.20090923:0= ) x265? ( media-libs/x265:0= ) xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 ) xml? ( >=dev-libs/libxml2-2.5:2 ) zvbi? ( >=media-libs/zvbi-0.2.25:0 ) kde? ( >=kde-base/kdelibs-4:4 ) xcb? ( x11-proto/xproto:0 ) app-arch/xz-utils:0 x86? ( dev-lang/yasm:* ) amd64? ( dev-lang/yasm:* ) >=sys-devel/gettext-0.18.3:* 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=VLC media player - Video player and streamer
 EAPI=5
 HOMEPAGE=http://www.videolan.org/vlc/
 IUSE=a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi test
 KEYWORDS=amd64 ~arm ppc ppc64 -sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=!<media-video/ffmpeg-1.2:0 dev-libs/libgpg-error:0 net-dns/libidn:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-11:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( >=dev-libs/fribidi-0.10.4:0 ) bluray? ( >=media-libs/libbluray-0.3:0 ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= sys-libs/zlib:0 ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 ) rdp? ( >=net-misc/freerdp-1.0.1:0=[client] ) samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] ) >=net-fs/samba-4.0.0_alpha1:0[client] ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( media-libs/speex:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) vdpau? ( >=x11-libs/libvdpau-0.6:0 !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( >=media-libs/libvorbis-1.1:0 ) vpx? ( media-libs/libvpx:0 ) X? ( x11-libs/libX11:0 ) x264? ( >=media-libs/x264-0.0.20090923:0= ) x265? ( media-libs/x265:0= ) xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 ) xml? ( >=dev-libs/libxml2-2.5:2 ) zvbi? ( >=media-libs/zvbi-0.2.25:0 )
+RDEPEND=!>=media-video/ffmpeg-3.0:0 dev-libs/libgpg-error:0 net-dns/libidn:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] virtual/libintl:0 a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) aalib? ( media-libs/aalib:0 ) alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) libav? ( >=media-video/libav-11:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) bidi? ( >=dev-libs/fribidi-0.10.4:0 ) bluray? ( >=media-libs/libbluray-0.3:0 ) cddb? ( >=media-libs/libcddb-1.2:0 ) chromaprint? ( >=media-libs/chromaprint-0.6:0 ) dbus? ( >=sys-apps/dbus-1.6:0 ) dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 ) dts? ( >=media-libs/libdca-0.0.5:0 ) dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0= ) dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) faad? ( >=media-libs/faad2-2.6.1:0 ) fdk? ( media-libs/fdk-aac:0 ) flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) gme? ( media-libs/game-music-emu:0 ) gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) gnutls? ( >=net-libs/gnutls-3.0.20:0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 ) jpeg? ( virtual/jpeg:0 ) kate? ( >=media-libs/libkate-0.3:0 ) libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 ) libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) libtiger? ( >=media-libs/libtiger-0.3.1:0 ) linsys? ( >=media-libs/zvbi-0.2.28:0 ) lirc? ( app-misc/lirc:0 ) live? ( >=media-plugins/live-2011.12.23:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) mp3? ( media-libs/libmad:0 ) mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) mtp? ( >=media-libs/libmtp-1:0 ) musepack? ( >=media-sound/musepack-tools-444:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) ogg? ( >=media-libs/libogg-1:0 ) opencv? ( >media-libs/opencv-2:0 ) opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= sys-libs/zlib:0 ) postproc? ( !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) pulseaudio? ( >=media-sound/pulseaudio-1:0 ) qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 ) qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5 >=dev-qt/qtx11extras-5.1:5 ) rdp? ( >=net-misc/freerdp-1.0.1:0=[client] ) samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] <net-fs/samba-4.0.0_alpha1:0[smbclient] ) >=net-fs/samba-4.0.0_alpha1:0[client] ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) sftp? ( net-libs/libssh2:0 ) shout? ( >=media-libs/libshout-2.1:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) speex? ( media-libs/speex:0 ) svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) swscale? ( !libav? ( media-video/ffmpeg:0= ) libav? ( media-video/libav:0= ) ) taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 ) theora? ( >=media-libs/libtheora-1.0_beta3:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0[X,drm] !libav? ( media-video/ffmpeg:0=[vaapi] ) libav? ( media-video/libav:0=[vaapi] ) ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) vdpau? ( >=x11-libs/libvdpau-0.6:0 !libav? ( >=media-video/ffmpeg-2.2:0= ) libav? ( >=media-video/libav-10:0= ) ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( >=media-libs/libvorbis-1.1:0 ) vpx? ( media-libs/libvpx:0 ) X? ( x11-libs/libX11:0 ) x264? ( >=media-libs/x264-0.0.20090923:0= ) x265? ( media-libs/x265:0= ) xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 ) xml? ( >=dev-libs/libxml2-2.5:2 ) zvbi? ( >=media-libs/zvbi-0.2.25:0 )
 REQUIRED_USE=aalib? ( X ) bidi? ( truetype ) cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) qt4? ( X !qt5 ) qt5? ( X !qt4 ) sdl? ( X ) skins? ( truetype X xml ^^ ( qt4 qt5 ) ) vaapi? ( avcodec X ) vdpau? ( xcb ) vlm? ( encode ) xv? ( xcb )
 SLOT=0/5-8
 SRC_URI=http://download.videolan.org/pub/videolan/vlc/2.2.1/vlc-2.2.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=541f3e8caed8fc93764ea2b51600cc57
+_md5_=9fecc11d5c6cc025a1155e7bbad8294d
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8 b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8
index cb28102ef39f..c5d461aff877 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8
+++ b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8
@@ -4,10 +4,10 @@ DESCRIPTION=An ethernet monitor program that keeps track of ethernet/ip address
 EAPI=5
 HOMEPAGE=http://ee.lbl.gov/
 IUSE=selinux
-KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 hppa ~ppc ~sparc ~x86 ~x86-fbsd
 LICENSE=BSD GPL-2
 RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch )
 SLOT=0
 SRC_URI=ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz https://dev.gentoo.org/~jer/arpwatch-patchset-0.7.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d79480e1e5935fe409d7e7ea24f40de6
+_md5_=f3d13622c901cc6bcc93be06cc6264eb
diff --git a/metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1 b/metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1
index 3cc82ff6d353..0429f19b830d 100644
--- a/metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1
+++ b/metadata/md5-cache/net-analyzer/jmx2munin-1.0_p20120811-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/jcommander:0 net-analyzer/munin >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/gentoo/jmx2munin/tarball/jmx2munin-gentoo-1.0_p20120811 -> jmx2munin-gentoo-1.0_p20120811.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f635ca769a0e2e5e4732ca5797e57d8
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.11.5_p2015110401-r1 b/metadata/md5-cache/net-analyzer/metasploit-4.11.5_p2015110401-r1
index a4b02244dd13..c047ca4da8c6 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.11.5_p2015110401-r1
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.11.5_p2015110401-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=strip
 SLOT=4.11
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.11.5-2015110401.tar.gz -> metasploit-4.11.5_p2015110401.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c66d031fe2d5658e4603608335ae96d4
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.11.7 b/metadata/md5-cache/net-analyzer/metasploit-4.11.7
index c09d9e8613db..d28fba80acef 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.11.7
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.11.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=strip
 SLOT=4.11
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.11.7.tar.gz -> metasploit-4.11.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99f2c096080254351d297f957f5c3ea1
diff --git a/metadata/md5-cache/net-analyzer/metasploit-9999 b/metadata/md5-cache/net-analyzer/metasploit-9999
index 7d24967c5077..9cca32f098ea 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-9999
+++ b/metadata/md5-cache/net-analyzer/metasploit-9999
@@ -9,5 +9,5 @@ RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=strip
 SLOT=9999
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe62077604eb2f4c647a838470e92e00
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.19 b/metadata/md5-cache/net-analyzer/munin-2.0.19
index 904946faa885..22e5776353de 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.19
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.19
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-py
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.19.tar.gz https://dev.gentoo.org/~flameeyes/munin/munin-2.0.19-gentoo-1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3164cda1e25ef2836aa333762e114c1
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.19-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
index d23073c8ee98..bddb1166ebfc 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.19-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-py
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.19.tar.gz https://dev.gentoo.org/~flameeyes/munin/munin-2.0.19-gentoo-1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e1997abd0c204db520f96b3699d27e90
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.25 b/metadata/md5-cache/net-analyzer/munin-2.0.25
index 18415832d7c4..8ad48c4f0c29 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.25
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.25
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[berkdb] dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.25.tar.gz https://dev.gentoo.org/~jlec/distfiles/munin-2.0.25-gentoo-1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e0f0ef540ad92c80bd75f741fe3ffd08
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.25-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.25-r1
index 3c05afcd8583..aff1715503ef 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.25-r1
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.25-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl[berkdb] dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
 SRC_URI=mirror://sourceforge/munin/munin-2.0.25.tar.gz https://dev.gentoo.org/~jlec/distfiles/munin-2.0.25-gentoo-1.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a90c651a0ebad700cb99b075ee0ddaa5
diff --git a/metadata/md5-cache/net-analyzer/munin-2.1.9999 b/metadata/md5-cache/net-analyzer/munin-2.1.9999
index eebef0166037..bd2acea3d764 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.1.9999
+++ b/metadata/md5-cache/net-analyzer/munin-2.1.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) !<sys-apps/openrc-0.11.8 java? ( >=dev-java/java-config-2.2.0 )
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c053fbb1e5aeff8e08c3218e3e76b9b5
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.11 b/metadata/md5-cache/net-analyzer/zabbix-2.2.11
index cb2b2a9cf677..0d06e61890d6 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.11
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.11.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=40ddf1ee718640d65c4b819b67e41c62
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.5 b/metadata/md5-cache/net-analyzer/zabbix-2.2.5
index 1e11e19c4b0c..afecbc618cbe 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.5
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api dev-java/json-simple ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.5.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=40575fbcceb741ad702d3e22ec318a9e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.9 b/metadata/md5-cache/net-analyzer/zabbix-2.2.9
index aaa1ea61a7d5..122cedec4459 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.9
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.9.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=40ddf1ee718640d65c4b819b67e41c62
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.4.5 b/metadata/md5-cache/net-analyzer/zabbix-2.4.5
index baf44628e393..fe76d90cbe66 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.4.5
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.6 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.4.5.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=26acc9a7b1376543c5c50d336465041b
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.4.7 b/metadata/md5-cache/net-analyzer/zabbix-2.4.7
index fb65adb96a1e..2ea40e09d018 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.4.7
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.4.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( <=net-analyzer/fping-2.9 ) server? ( <=net-analyzer/fping-2.9 app-admin/webapp-config ) java? ( >=virtual/jre-1.6 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.4.7.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=26acc9a7b1376543c5c50d336465041b
diff --git a/metadata/md5-cache/net-dialup/freeradius-client-1.1.7 b/metadata/md5-cache/net-dialup/freeradius-client-1.1.7
index 407c585c7441..f3e048669aae 100644
--- a/metadata/md5-cache/net-dialup/freeradius-client-1.1.7
+++ b/metadata/md5-cache/net-dialup/freeradius-client-1.1.7
@@ -4,10 +4,10 @@ DESCRIPTION=FreeRADIUS Client framework
 EAPI=5
 HOMEPAGE=http://wiki.freeradius.org/Radiusclient
 IUSE=scp shadow static-libs
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=!net-dialup/radiusclient !net-dialup/radiusclient-ng
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/freeradius/freeradius-client-1.1.7.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=bd675c89d6fd964ce240eccd77b83835
+_md5_=d24452e3842320eb6a16743adf85df5f
diff --git a/metadata/md5-cache/net-dialup/moserial-3.0.10 b/metadata/md5-cache/net-dialup/moserial-3.0.10
index 8af42f4ca896..8c983a8d5ccd 100644
--- a/metadata/md5-cache/net-dialup/moserial-3.0.10
+++ b/metadata/md5-cache/net-dialup/moserial-3.0.10
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.16:2[dbus] gnome-base/gsettings-desktop-schemas >=x11-l
 DESCRIPTION=A clean and friendly gtk-based serial terminal
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/moserial
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16:2[dbus] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.0.0:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/moserial/3.0/moserial-3.0.10.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c5c8b2c36f2ea9a67671b7947905c78d
+_md5_=503539b83f71528d10c6f496d4efdca3
diff --git a/metadata/md5-cache/net-dns/c-ares-1.10.0 b/metadata/md5-cache/net-dns/c-ares-1.10.0
deleted file mode 100644
index e7ac8c29851f..000000000000
--- a/metadata/md5-cache/net-dns/c-ares-1.10.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=C library that resolves names asynchronously
-EAPI=4
-HOMEPAGE=http://c-ares.haxx.se/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz
-_md5_=6b491bbbf36a265205d8e3584dc03b0a
diff --git a/metadata/md5-cache/net-dns/c-ares-1.11.0 b/metadata/md5-cache/net-dns/c-ares-1.11.0
new file mode 100644
index 000000000000..392f24ea1b4d
--- /dev/null
+++ b/metadata/md5-cache/net-dns/c-ares-1.11.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=C library that resolves names asynchronously
+EAPI=5
+HOMEPAGE=http://c-ares.haxx.se/
+IUSE=static-libs 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
+LICENSE=MIT
+SLOT=0/2
+SRC_URI=http://c-ares.haxx.se/download/c-ares-1.11.0.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=316abd00ab4da4c69104d14904a26c65
diff --git a/metadata/md5-cache/net-dns/c-ares-1.7.4 b/metadata/md5-cache/net-dns/c-ares-1.7.4
deleted file mode 100644
index 0a958b2e3287..000000000000
--- a/metadata/md5-cache/net-dns/c-ares-1.7.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=C library that resolves names asynchronously
-EAPI=2
-HOMEPAGE=http://c-ares.haxx.se/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://c-ares.haxx.se/download/c-ares-1.7.4.tar.gz
-_md5_=b4de0894a04645d320d00d60fcb9b360
diff --git a/metadata/md5-cache/net-dns/c-ares-1.7.5 b/metadata/md5-cache/net-dns/c-ares-1.7.5
deleted file mode 100644
index 6ced2a2b797b..000000000000
--- a/metadata/md5-cache/net-dns/c-ares-1.7.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=C library that resolves names asynchronously
-EAPI=4
-HOMEPAGE=http://c-ares.haxx.se/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://c-ares.haxx.se/download/c-ares-1.7.5.tar.gz
-_md5_=fa3497ed09157f35071d56c5eb92fcba
diff --git a/metadata/md5-cache/net-dns/c-ares-1.8.0 b/metadata/md5-cache/net-dns/c-ares-1.8.0
deleted file mode 100644
index 8729c25978a5..000000000000
--- a/metadata/md5-cache/net-dns/c-ares-1.8.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=C library that resolves names asynchronously
-EAPI=4
-HOMEPAGE=http://c-ares.haxx.se/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://c-ares.haxx.se/download/c-ares-1.8.0.tar.gz
-_md5_=fa3497ed09157f35071d56c5eb92fcba
diff --git a/metadata/md5-cache/net-dns/c-ares-1.9.1 b/metadata/md5-cache/net-dns/c-ares-1.9.1
deleted file mode 100644
index 54eb07501dc8..000000000000
--- a/metadata/md5-cache/net-dns/c-ares-1.9.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=C library that resolves names asynchronously
-EAPI=4
-HOMEPAGE=http://c-ares.haxx.se/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=http://c-ares.haxx.se/download/c-ares-1.9.1.tar.gz
-_md5_=cfd23be2e3c17413022dc91f49463704
diff --git a/metadata/md5-cache/net-dns/libidn-1.30 b/metadata/md5-cache/net-dns/libidn-1.30
index a2f59f94badf..016b35751e42 100644
--- a/metadata/md5-cache/net-dns/libidn-1.30
+++ b/metadata/md5-cache/net-dns/libidn-1.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.30.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d14e2a397722fb79027d156fbc74ebec
diff --git a/metadata/md5-cache/net-dns/libidn-1.32-r1 b/metadata/md5-cache/net-dns/libidn-1.32-r1
index c0f4db1ffa9a..afe30c117db1 100644
--- a/metadata/md5-cache/net-dns/libidn-1.32-r1
+++ b/metadata/md5-cache/net-dns/libidn-1.32-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.32.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=234e4fa38301e17e9f227496b5c196ee
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.16 b/metadata/md5-cache/net-fs/openafs-1.6.16
new file mode 100644
index 000000000000..f7dced15bf0c
--- /dev/null
+++ b/metadata/md5-cache/net-fs/openafs-1.6.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=sys-libs/ncurses:0= pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) !<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=The OpenAFS distributed file system
+EAPI=6
+HOMEPAGE=http://www.openafs.org/
+IUSE=doc kerberos +modules pam
+KEYWORDS=~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux
+LICENSE=IBM BSD openafs-krb5-a APSL-2
+RDEPEND=sys-libs/ncurses:0= pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) modules? ( ~net-fs/openafs-kernel-1.6.16 )
+SLOT=0
+SRC_URI=http://openafs.org/dl/openafs/1.6.16/openafs-1.6.16-src.tar.bz2 http://openafs.org/dl/openafs/1.6.16/openafs-1.6.16-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20160223.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=90328bd02d50a6e562273710e05d7103
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.16 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.16
new file mode 100644
index 000000000000..0549c0abf949
--- /dev/null
+++ b/metadata/md5-cache/net-fs/openafs-kernel-1.6.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend 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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=The OpenAFS distributed file system kernel module
+EAPI=6
+HOMEPAGE=http://www.openafs.org/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux
+LICENSE=IBM BSD openafs-krb5-a APSL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://openafs.org/dl/openafs/1.6.16/openafs-1.6.16-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20160223.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=25db10c57253f5ace582ab582a09b5da
diff --git a/metadata/md5-cache/net-im/kouchat-1.1.0 b/metadata/md5-cache/net-im/kouchat-1.1.0
index 59988970811f..2d8aab9cda9a 100644
--- a/metadata/md5-cache/net-im/kouchat-1.1.0
+++ b/metadata/md5-cache/net-im/kouchat-1.1.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://kouchat.googlecode.com/files/kouchat-1.1.0-src.tar.gz https://dev.gentoo.org/~serkan/distfiles/kouchat-1.1.0-buildfiles.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e39cc1a81cebc703e5a455d1d6cc478e
diff --git a/metadata/md5-cache/net-im/openfire-3.10.0 b/metadata/md5-cache/net-im/openfire-3.10.0
index 40c064bea68d..087e31ae68b1 100644
--- a/metadata/md5-cache/net-im/openfire-3.10.0
+++ b/metadata/md5-cache/net-im/openfire-3.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_10_0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61789a4147dd1daa7f5c6c6d91007510
diff --git a/metadata/md5-cache/net-im/openfire-3.10.1 b/metadata/md5-cache/net-im/openfire-3.10.1
index e96b6c6900ec..386f7b43e613 100644
--- a/metadata/md5-cache/net-im/openfire-3.10.1
+++ b/metadata/md5-cache/net-im/openfire-3.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_10_1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2549f8a0e85854ae37b9416f4a08dba4
diff --git a/metadata/md5-cache/net-im/openfire-3.10.2 b/metadata/md5-cache/net-im/openfire-3.10.2
index bfca9110b7d7..769eb6626400 100644
--- a/metadata/md5-cache/net-im/openfire-3.10.2
+++ b/metadata/md5-cache/net-im/openfire-3.10.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_10_2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61789a4147dd1daa7f5c6c6d91007510
diff --git a/metadata/md5-cache/net-im/openfire-3.10.3 b/metadata/md5-cache/net-im/openfire-3.10.3
index c81bbd307ee5..5b2d35c73f66 100644
--- a/metadata/md5-cache/net-im/openfire-3.10.3
+++ b/metadata/md5-cache/net-im/openfire-3.10.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_3_10_3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2549f8a0e85854ae37b9416f4a08dba4
diff --git a/metadata/md5-cache/net-im/openfire-4.0.0 b/metadata/md5-cache/net-im/openfire-4.0.0
index badbc4633353..ebc73de51ad5 100644
--- a/metadata/md5-cache/net-im/openfire-4.0.0
+++ b/metadata/md5-cache/net-im/openfire-4.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_0_0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2549f8a0e85854ae37b9416f4a08dba4
diff --git a/metadata/md5-cache/net-im/openfire-4.0.1 b/metadata/md5-cache/net-im/openfire-4.0.1
index 6e4cf7a2ac92..6d0163a36730 100644
--- a/metadata/md5-cache/net-im/openfire-4.0.1
+++ b/metadata/md5-cache/net-im/openfire-4.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.igniterealtime.org/builds/openfire/openfire_src_4_0_1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2549f8a0e85854ae37b9416f4a08dba4
diff --git a/metadata/md5-cache/net-irc/epic5-1.1.10-r1 b/metadata/md5-cache/net-irc/epic5-1.1.10-r1
index 7c154d7f78e1..911cfc099e34 100644
--- a/metadata/md5-cache/net-irc/epic5-1.1.10-r1
+++ b/metadata/md5-cache/net-irc/epic5-1.1.10-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2 virtual/libicon
 REQUIRED_USE=ruby? ( ^^ ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ) ) ruby_targets_ruby20? ( ruby ) ruby_targets_ruby21? ( ruby ) ruby_targets_ruby22? ( ruby )
 SLOT=0
 SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.10.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74cc89296c582e4e078c9b01bfdc7c24
diff --git a/metadata/md5-cache/net-irc/jircii-41 b/metadata/md5-cache/net-irc/jircii-41
index 7414ed5affe0..e81d0844e731 100644
--- a/metadata/md5-cache/net-irc/jircii-41
+++ b/metadata/md5-cache/net-irc/jircii-41
@@ -9,5 +9,5 @@ LICENSE=Artistic
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://jirc.hick.org/download/jerkb41.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc6f21e8fea99d0e6859af2b2bd4402a
diff --git a/metadata/md5-cache/net-irc/polari-3.18.1 b/metadata/md5-cache/net-irc/polari-3.18.1
index 42833aaea26d..800d658a710d 100644
--- a/metadata/md5-cache/net-irc/polari-3.18.1
+++ b/metadata/md5-cache/net-irc/polari-3.18.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/gjs >=dev-libs/glib-2.43.4:2 >=dev-libs/gobject-introspection-0.
 DESCRIPTION=An IRC client for Gnome
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Polari
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gjs >=dev-libs/glib-2.43.4:2 >=dev-libs/gobject-introspection-0.9.6 net-libs/telepathy-glib[introspection] >=x11-libs/gtk+-3.15.6:3[introspection] >=net-irc/telepathy-idle-0.2
 SLOT=0
 SRC_URI=mirror://gnome/sources/polari/3.18/polari-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1c517b418cdb80a0a0d2b9f8183c69d6
+_md5_=0c16db7bf11b9075c0f161dfabbda527
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1
index db2e3e1ce8ab..08d29faafd90 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20131020-r1
@@ -10,5 +10,5 @@ RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) fi
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://dev.a3li.li/gentoo/distfiles/rbot-0.9.15_p20131020.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3fdfb7b09bac3a7d96cd7d8a6e21e856
diff --git a/metadata/md5-cache/net-libs/NativeThread-0_pre20080330 b/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
index 6ce121fca609..c5f6da459c29 100644
--- a/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
+++ b/metadata/md5-cache/net-libs/NativeThread-0_pre20080330
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/NativeThread-0_pre20080330.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=deb0198d1a826039c6239c0857e0d235
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.46.1 b/metadata/md5-cache/net-libs/glib-networking-2.46.1
index 37becd33ac68..eecf52cb30b0 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.46.1
+++ b/metadata/md5-cache/net-libs/glib-networking-2.46.1
@@ -4,10 +4,10 @@ DESCRIPTION=Network-related giomodules for glib
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/glib-networking/
 IUSE=+gnome +libproxy smartcard +ssl 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 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=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(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[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(-)?] ) smartcard? ( >=app-crypt/p11-kit-0.18.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(-)?] >=net-libs/gnutls-3:=[pkcs11,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(-)?] ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-3:=[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=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.46/glib-networking-2.46.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=09b73fc757ee5fc9ddbe480d8b6fc28c
+_md5_=a3e11b240d88ea69c5c43da648e3aea1
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.18.4 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.18.4
index 91ed3957ad5d..32ae19ec126c 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.18.4
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.18.4
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME framework for accessing online accounts
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
 IUSE=gnome +introspection kerberos debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
 PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
 RDEPEND=>=dev-libs/glib-2.35:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 net-libs/telepathy-glib >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.11.1:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0= app-crypt/mit-krb5 )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.18/gnome-online-accounts-3.18.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=228ce6dd68c49031352ceb2f00422e06
+_md5_=488a03ac8f7c7dac6dba44fe66bbe427
diff --git a/metadata/md5-cache/net-libs/gssdp-0.14.14 b/metadata/md5-cache/net-libs/gssdp-0.14.14
index 74fe91cc7b24..0a3232cc19c1 100644
--- a/metadata/md5-cache/net-libs/gssdp-0.14.14
+++ b/metadata/md5-cache/net-libs/gssdp-0.14.14
@@ -4,10 +4,10 @@ DESCRIPTION=A GObject-based API for handling resource discovery and announcement
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=+introspection +gtk 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 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3: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(-)?] >=net-libs/libsoup-2.44.2:2.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(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) >=dev-libs/gobject-introspection-1.36:= ) !<net-libs/gupnp-vala-0.10.3
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/gssdp/0.14/gssdp-0.14.14.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=35c76194b3b155be40573e1ff6546195
+_md5_=f11745b7cb50f5b0cba5a2b99def3193
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.16 b/metadata/md5-cache/net-libs/gupnp-0.20.16
index f1ce0c764f42..0b730352f69c 100644
--- a/metadata/md5-cache/net-libs/gupnp-0.20.16
+++ b/metadata/md5-cache/net-libs/gupnp-0.20.16
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented framework for creating UPnP devs and control poin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=connman +introspection kernel_linux networkmanager 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 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=net-libs/gssdp-0.14.13:0=[introspection?,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(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,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.40: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/libxml2-2.9.1-r4[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(-)?] >=sys-apps/util-linux-2.24.1-r3[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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.36:= || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) ) connman? ( >=dev-libs/glib-2.34.3: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(-)?] ) networkmanager? ( >=dev-libs/glib-2.34.3: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(-)?] ) !net-libs/gupnp-vala
 REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( connman networkmanager )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.16.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=35f8c96ce9f218c2c672e080c892fef2
+_md5_=3adc244130624e46cf05dc95172ca1c3
diff --git a/metadata/md5-cache/net-libs/gupnp-av-0.12.8 b/metadata/md5-cache/net-libs/gupnp-av-0.12.8
index 78312d11c19c..09cb5008f5dd 100644
--- a/metadata/md5-cache/net-libs/gupnp-av-0.12.8
+++ b/metadata/md5-cache/net-libs/gupnp-av-0.12.8
@@ -4,10 +4,10 @@ DESCRIPTION=Utility library aiming to ease the handling UPnP A/V profiles
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 >=net-libs/gssdp-0.9.2[introspection?] >=net-libs/libsoup-2.28.2:2.4[introspection?] dev-libs/libxml2 >=net-libs/gupnp-0.19[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !net-libs/gupnp-vala
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.8.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=164599301ae0f8351d35ce8d49c1fcc3
+_md5_=9c8fc33ea7f5c440048d736498693c7d
diff --git a/metadata/md5-cache/net-libs/librsync-0.9.7-r3 b/metadata/md5-cache/net-libs/librsync-0.9.7-r3
index af29fd3d723b..30d943e58693 100644
--- a/metadata/md5-cache/net-libs/librsync-0.9.7-r3
+++ b/metadata/md5-cache/net-libs/librsync-0.9.7-r3
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/popt
 SLOT=0/1
 SRC_URI=mirror://sourceforge/librsync/librsync-0.9.7.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=29b867f91130690652c1af99b92f5165
+_md5_=9b8ebbd06db0d3a286a83859bfc0c455
diff --git a/metadata/md5-cache/net-libs/librsync-2.0.0 b/metadata/md5-cache/net-libs/librsync-2.0.0
index 6ea95a0f1061..354c920fe381 100644
--- a/metadata/md5-cache/net-libs/librsync-2.0.0
+++ b/metadata/md5-cache/net-libs/librsync-2.0.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/popt sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=Remote delta-compression library
 EAPI=5
 HOMEPAGE=http://librsync.sourcefrog.net/
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt
 SLOT=0
 SRC_URI=https://github.com/librsync/librsync/archive/v2.0.0.tar.gz -> librsync-2.0.0.tar.gz
 _eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=eca9bf13a4a4cbb8049ec066b75288c8
+_md5_=3769b58e9647d0347d3b969ab67dd584
diff --git a/metadata/md5-cache/net-libs/libsoup-2.52.2 b/metadata/md5-cache/net-libs/libsoup-2.52.2
index 3db500691caa..51cbb22bb731 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.52.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.52.2
@@ -4,10 +4,10 @@ DESCRIPTION=An HTTP library implementation in C
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
 IUSE=+introspection samba ssl test vala debug 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3: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/libxml2-2.9.1-r4: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-db/sqlite-3.8.2:3[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(-)?] >=net-libs/glib-networking-2.38.2[ssl?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.52/libsoup-2.52.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d73a9f2ee64b46fea85a41ada7c2dd45
+_md5_=30f959eafd4c0896401a855aa3ed621e
diff --git a/metadata/md5-cache/net-libs/libsoup-gnome-2.52.2 b/metadata/md5-cache/net-libs/libsoup-gnome-2.52.2
index 5066e1e66a63..e46e10a53588 100644
--- a/metadata/md5-cache/net-libs/libsoup-gnome-2.52.2
+++ b/metadata/md5-cache/net-libs/libsoup-gnome-2.52.2
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME plugin for libsoup
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/LibSoup
 IUSE=+introspection debug 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 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=~net-libs/libsoup-2.52.2[introspection?,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-db/sqlite:3=[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.52/libsoup-2.52.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=116eeedb559480ce3d1ded9e0d46eb4c
+_md5_=e25595e460b73f14118bc3aa302f8c37
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4 b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
index 8278f7664da7..6074871627fa 100644
--- a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4
@@ -9,5 +9,5 @@ LICENSE=|| ( public-domain BSD MIT )
 RDEPEND=dev-libs/gmp >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/nativebiginteger-0.6.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7380a0d2e60df412f702cd4af34af641
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3 b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
index f4f1401baf29..034e49028b80 100644
--- a/metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( public-domain BSD MIT )
 RDEPEND=dev-libs/gmp >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/nativebiginteger-0.6.4.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0134430f139fe1c182fdf58154d32c4c
diff --git a/metadata/md5-cache/net-libs/nativebiginteger-0.8.7 b/metadata/md5-cache/net-libs/nativebiginteger-0.8.7
index c90bc97671ad..3c22ca9f96f7 100644
--- a/metadata/md5-cache/net-libs/nativebiginteger-0.8.7
+++ b/metadata/md5-cache/net-libs/nativebiginteger-0.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( public-domain BSD MIT )
 RDEPEND=dev-libs/gmp >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://mirror.i2p2.de/i2psource_0.8.7.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da4cf6cccb3bd77b9be52d223f86a192
diff --git a/metadata/md5-cache/net-libs/opal-3.10.11 b/metadata/md5-cache/net-libs/opal-3.10.11
index 556cfd59ddfa..edfd3cd10668 100644
--- a/metadata/md5-cache/net-libs/opal-3.10.11
+++ b/metadata/md5-cache/net-libs/opal-3.10.11
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.10.11.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.10.11-htmldoc.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c138ff36d63bbdfb4abf670c03c51d1d
diff --git a/metadata/md5-cache/net-libs/opal-3.12.4 b/metadata/md5-cache/net-libs/opal-3.12.4
index c07ac3b22a03..9c694d15f12c 100644
--- a/metadata/md5-cache/net-libs/opal-3.12.4
+++ b/metadata/md5-cache/net-libs/opal-3.12.4
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/ptlib-2.12.4:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,
 REQUIRED_USE=x264-static? ( x264 ) h281? ( h224 ) sip? ( sipim )
 SLOT=0
 SRC_URI=mirror://sourceforge/opalvoip/opal-3.12.4.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.12.4-htmldoc.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee55cba9f9a6f46717887c3aa5020f2a
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.10.7 b/metadata/md5-cache/net-libs/webkit-gtk-2.10.7
index 815fab1a98ac..dfba22c153db 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.10.7
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.10.7
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=5
 HOMEPAGE=http://www.webkitgtk.org/
 IUSE=aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2+ BSD
 RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.36:2 >=dev-libs/icu-3.8.1-r1:= >=dev-libs/libxml2-2.8:2 >=dev-libs/libxslt-1.1.7 >=media-libs/fontconfig-2.8:1.0 >=media-libs/freetype-2.4.2:2 >=media-libs/harfbuzz-0.9.18:=[icu(+)] >=media-libs/libpng-1.4:0= media-libs/libwebp:= >=net-libs/gnutls-3 >=net-libs/libsoup-2.42:2.4[introspection?] virtual/jpeg:0= >=x11-libs/cairo-1.10.2:= >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libnotify >=x11-libs/pango-1.30.0 aqua? ( >=x11-libs/gtk+-3.14:3[aqua] ) egl? ( media-libs/mesa[egl] ) geoloc? ( >=app-misc/geoclue-2.1.5:2.0 ) gles2? ( media-libs/mesa[gles2] ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gstreamer-1.2:1.0 >=media-libs/gst-plugins-base-1.2:1.0 >=media-libs/gst-plugins-bad-1.5.0:1.0[opengl?] ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) opengl? ( virtual/opengl x11-libs/cairo[opengl] ) spell? ( >=app-text/enchant-0.22:= ) wayland? ( >=x11-libs/gtk+-3.14:3[wayland] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) X? ( x11-libs/cairo[X] >=x11-libs/gtk+-3.14:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXt )
 REQUIRED_USE=geoloc? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.10.7.tar.xz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-single	c49250968781888465d5a8597376297f	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=597e2ab4cf377acd07b7b08c23ecb2ed
+_md5_=75b30f9d8e2174c49060623720e64e74
diff --git a/metadata/md5-cache/net-mail/Freemail-9999-r1 b/metadata/md5-cache/net-mail/Freemail-9999-r1
index 9f2c56410937..647ead96215c 100644
--- a/metadata/md5-cache/net-mail/Freemail-9999-r1
+++ b/metadata/md5-cache/net-mail/Freemail-9999-r1
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/bcprov:1.38 net-p2p/freenet >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d60de28c71690812cd8621389623a3e
diff --git a/metadata/md5-cache/net-mail/mailshears-0.0.2-r1 b/metadata/md5-cache/net-mail/mailshears-0.0.2-r1
index f8c521858674..58fba74ff03c 100644
--- a/metadata/md5-cache/net-mail/mailshears-0.0.2-r1
+++ b/metadata/md5-cache/net-mail/mailshears-0.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/pg-0.17[ruby_targets_ruby20] <dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=mirror://rubygems/mailshears-0.0.2.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98675b8e8833ff1c3c9095485f87709f
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-47.0.2526.18 b/metadata/md5-cache/net-misc/chrome-remote-desktop-47.0.2526.18
index b37af6415167..04e8df73fc4c 100644
--- a/metadata/md5-cache/net-misc/chrome-remote-desktop-47.0.2526.18
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-47.0.2526.18
@@ -3,10 +3,10 @@ DESCRIPTION=access remote computers via Chrome!
 EAPI=5
 HOMEPAGE=https://support.google.com/chrome/answer/1649523 https://chrome.google.com/remotedesktop
 IUSE=python_targets_python2_7
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=google-chrome
 RDEPEND=app-admin/sudo >=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-libs/expat-2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-python/psutil gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype:2 sys-devel/gcc sys-libs/glibc sys-libs/pam x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXtst x11-libs/pango x11-base/xorg-server[xvfb]
 SLOT=0
 SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_47.0.2526.18_amd64.deb ) x86? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_47.0.2526.18_i386.deb )
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=3f6121d81ecf1e65f8afb17824aa893c
+_md5_=dbc5d35a1d17a53448c9e460b8e68c5c
diff --git a/metadata/md5-cache/net-misc/chrome-remote-desktop-49.0.2623.40 b/metadata/md5-cache/net-misc/chrome-remote-desktop-49.0.2623.40
new file mode 100644
index 000000000000..927bf7d9cae4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/chrome-remote-desktop-49.0.2623.40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare setup unpack
+DESCRIPTION=access remote computers via Chrome!
+EAPI=5
+HOMEPAGE=https://support.google.com/chrome/answer/1649523 https://chrome.google.com/remotedesktop
+IUSE=python_targets_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=google-chrome
+RDEPEND=app-admin/sudo >=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-libs/expat-2 dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-python/psutil gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype:2 sys-devel/gcc sys-libs/glibc sys-libs/pam x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXtst x11-libs/pango x11-base/xorg-server[xvfb]
+SLOT=0
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_49.0.2623.40_amd64.deb ) x86? ( https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/chrome-remote-desktop/chrome-remote-desktop_49.0.2623.40_i386.deb )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
+_md5_=3f6121d81ecf1e65f8afb17824aa893c
diff --git a/metadata/md5-cache/net-misc/gnome-online-miners-3.14.3-r2 b/metadata/md5-cache/net-misc/gnome-online-miners-3.14.3-r2
index b823987f17e9..4f550782bee5 100644
--- a/metadata/md5-cache/net-misc/gnome-online-miners-3.14.3-r2
+++ b/metadata/md5-cache/net-misc/gnome-online-miners-3.14.3-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Crawls through your online content
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineMiners
 IUSE=flickr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=app-misc/tracker-1:0= >=dev-libs/glib-2.35.1:2 >=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts] >=media-libs/grilo-0.2.6:0.2 >=net-libs/gnome-online-accounts-3.13.3 >=net-libs/libgfbgraph-0.2.2:0.2 >=net-libs/libzapojit-0.0.2 flickr? ( media-plugins/grilo-plugins[flickr] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-online-miners/3.14/gnome-online-miners-3.14.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=35cccdaf89268fe3aee5001b5f689e63
+_md5_=74a573c26d8741776af3074be9554ff3
diff --git a/metadata/md5-cache/net-misc/gupnp-tools-0.8.11 b/metadata/md5-cache/net-misc/gupnp-tools-0.8.11
index 6bc19360a076..e8676dd69fb3 100644
--- a/metadata/md5-cache/net-misc/gupnp-tools-0.8.11
+++ b/metadata/md5-cache/net-misc/gupnp-tools-0.8.11
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.24:2 >=dev-libs/libxml2-2.4:2 >=net-libs/gssdp-0.13.3 >
 DESCRIPTION=Free replacements of Intel UPnP tools that use GUPnP
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:2 >=dev-libs/libxml2-2.4:2 >=net-libs/gssdp-0.13.3 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.5.5 net-libs/libsoup:2.4 >=x11-libs/gtk+-3.10:3 >=x11-libs/gtksourceview-3.2:3.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.11.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=32109882471f1d8dcf6a547a1584412b
+_md5_=55ac041ce50470565ecc929f414b790d
diff --git a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2 b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
index f365d84cf422..5cbba1fdb241 100644
--- a/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
+++ b/metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/jsap:0 dev-java/junit:4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.moldaner.de/wakeonlan/download/wakeonlan-1.0.0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e41a9b1525c46a6c84a9403a1c349f24
diff --git a/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0 b/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
index 07952e399463..0c0ad3e4e99e 100644
--- a/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
+++ b/metadata/md5-cache/net-misc/jrdesktop-0.3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jrdesktop/jrdesktop-source-0.3.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c71d4f1e05b09b67452fca724339b6c5
diff --git a/metadata/md5-cache/net-misc/mikutter-3.1.1 b/metadata/md5-cache/net-misc/mikutter-3.1.1
index f87d27e83711..4b8ad971310b 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.1.1
+++ b/metadata/md5-cache/net-misc/mikutter-3.1.1
@@ -10,5 +10,5 @@ RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.1.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53b92d024467c4618a8630a53d7ed7c0
diff --git a/metadata/md5-cache/net-misc/mikutter-3.2.7 b/metadata/md5-cache/net-misc/mikutter-3.2.7
index 018934ab9141..2cecf688e7eb 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.2.7
+++ b/metadata/md5-cache/net-misc/mikutter-3.2.7
@@ -10,5 +10,5 @@ RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.2.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e503274af21fda40193f05b0bccc20a2
diff --git a/metadata/md5-cache/net-misc/mikutter-3.3.5 b/metadata/md5-cache/net-misc/mikutter-3.3.5
index c861042ef3ec..b0e7c62e7fbf 100644
--- a/metadata/md5-cache/net-misc/mikutter-3.3.5
+++ b/metadata/md5-cache/net-misc/mikutter-3.3.5
@@ -10,5 +10,5 @@ RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.3.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c64ee3e03b87bf93f691a2359984c8e
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index ec5094ce4ff9..a26b31817683 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-ruby/delayer[ruby_targets_ruby20] dev-ruby/delayer-deferred[ruby_targets_ruby20] dev-ruby/httpclient[ruby_targets_ruby20] dev-ruby/json[ruby_targets_ruby20] dev-ruby/instance_storage[ruby_targets_ruby20] dev-ruby/memoist[ruby_targets_ruby20] >=dev-ruby/moneta-0.7[ruby_targets_ruby20] dev-ruby/nokogiri[ruby_targets_ruby20] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby20] dev-ruby/pluggaloid[ruby_targets_ruby20] dev-ruby/rcairo[ruby_targets_ruby20] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby20] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby20] dev-ruby/ruby-hmac[ruby_targets_ruby20] dev-ruby/totoridipjp[ruby_targets_ruby20] dev-ruby/twitter-text[ruby_targets_ruby20] dev-ruby/typed-array[ruby_targets_ruby20] virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/delayer[ruby_targets_ruby21] dev-ruby/delayer-deferred[ruby_targets_ruby21] dev-ruby/httpclient[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/instance_storage[ruby_targets_ruby21] dev-ruby/memoist[ruby_targets_ruby21] >=dev-ruby/moneta-0.7[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby21] dev-ruby/pluggaloid[ruby_targets_ruby21] dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby21] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby21] dev-ruby/ruby-hmac[ruby_targets_ruby21] dev-ruby/totoridipjp[ruby_targets_ruby21] dev-ruby/twitter-text[ruby_targets_ruby21] dev-ruby/typed-array[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c64ee3e03b87bf93f691a2359984c8e
diff --git a/metadata/md5-cache/net-misc/mindterm-3.4 b/metadata/md5-cache/net-misc/mindterm-3.4
index 0207a4140cc2..a0783ab1a35e 100644
--- a/metadata/md5-cache/net-misc/mindterm-3.4
+++ b/metadata/md5-cache/net-misc/mindterm-3.4
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jzlib:0 >=dev-java/java-config-2.2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.appgate.com/downloads/MindTerm-3.4/mindterm_3.4-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52a6b7ad765601567d47b7245b95a39e
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20151214 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20151214
index 86acac16d913..6e7ecd26c2ce 100644
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20151214
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20151214
@@ -4,9 +4,9 @@ DESCRIPTION=Database of mobile broadband service providers
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=CC-PD
 SLOT=0
 SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20151214/mobile-broadband-provider-info-20151214.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1b9f999ef1a171e9e2e1b8f2920cf4de
+_md5_=4e740a180cae76ed30aae5ba1a13441c
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.0.10-r1 b/metadata/md5-cache/net-misc/networkmanager-1.0.10-r1
index caaba5dae5b2..dfb0227896a5 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.0.10-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.0.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A set of co-operative tools that make networking simple and straight
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test vala +wext +wifi zeroconf 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 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-apps/dbus-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(-)?] >=dev-libs/dbus-glib-0.100[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.37.6: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/libnl-3.2.8:3= >=sys-auth/polkit-0.106 net-libs/libndp >=net-libs/libsoup-2.40:2.4= net-misc/iputils sys-libs/readline:0 >=virtual/libgudev-165:=[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(-)?] bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt: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(-)?] net-libs/gnutls:=[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(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[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(-)?] ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-209:0= ) !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) teamd? ( >=net-misc/libteam-1.9 ) zeroconf? ( net-dns/avahi:=[autoipd] ) consolekit? ( sys-auth/consolekit ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
 REQUIRED_USE=modemmanager? ( ppp ) wext? ( wifi ) ^^ ( nss gnutls ) ^^ ( dhclient dhcpcd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.0/NetworkManager-1.0.10.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=527940c030f687a5acdfb73983610ea2
+_md5_=4e2f0a5e8cb6b740334f450e8368ab72
diff --git a/metadata/md5-cache/net-misc/networkmanager-openconnect-1.0.8-r1 b/metadata/md5-cache/net-misc/networkmanager-openconnect-1.0.8-r1
index a53ee65e8576..5a31ce297734 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openconnect-1.0.8-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-openconnect-1.0.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager OpenConnect plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-0.9.10:= >=dev-libs/glib-2.32:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-misc/openconnect-3.02:= gtk? ( app-crypt/libsecret >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/1.0/NetworkManager-openconnect-1.0.8.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c9931c5d1107ee574a9144b27ec45376
+_md5_=e7f9284bc4b879d3c829cfa67007a01f
diff --git a/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8 b/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8
index 00108ac5eddc..ef6c5cdc4273 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8
+++ b/metadata/md5-cache/net-misc/networkmanager-openswan-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager Openswan plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libnl-3.2.8:3 >=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.10 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openswan/1.0/NetworkManager-openswan-1.0.8.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d1b86565159a266e37f16cb548dee76a
+_md5_=13276a8462a6efaaed42ec25973f3f66
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.0.8 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.0.8
index 73484c65af63..17635bc4aff4 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.0.8
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-misc/networkmanager-0.9.10:= >=net-misc/openvpn-2.1_rc9 gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-1.0.5 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.0/NetworkManager-openvpn-1.0.8.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=802a430640c6f17632d747130457b75c
+_md5_=f86c92246439babe6951bf8892c26574
diff --git a/metadata/md5-cache/net-misc/networkmanager-pptp-1.0.8 b/metadata/md5-cache/net-misc/networkmanager-pptp-1.0.8
index fda51784001b..472f0066b234 100644
--- a/metadata/md5-cache/net-misc/networkmanager-pptp-1.0.8
+++ b/metadata/md5-cache/net-misc/networkmanager-pptp-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager PPTP plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-1.0.5 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-pptp/1.0/NetworkManager-pptp-1.0.8.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fbe8028b0b8d54ab525e677e9e845e57
+_md5_=412a9da84ebd0c41ea61af0d3f466afd
diff --git a/metadata/md5-cache/net-misc/networkmanager-vpnc-1.0.8 b/metadata/md5-cache/net-misc/networkmanager-vpnc-1.0.8
index 444c022a6812..936b520a51c1 100644
--- a/metadata/md5-cache/net-misc/networkmanager-vpnc-1.0.8
+++ b/metadata/md5-cache/net-misc/networkmanager-vpnc-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager VPNC plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-0.9.10:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-misc/vpnc-0.5.3_p550 gtk? ( app-crypt/libsecret >=gnome-extra/nm-applet-1.0.5 >=x11-libs/gtk+-3.4:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/1.0/NetworkManager-vpnc-1.0.8.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=12f0abf00659be0a0b1cab66a4423baa
+_md5_=572280c996883f33f71824a4f8eaa73a
diff --git a/metadata/md5-cache/net-misc/openconnect-7.06 b/metadata/md5-cache/net-misc/openconnect-7.06
index 44c004db604f..4f89bde1cc3a 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.06
+++ b/metadata/md5-cache/net-misc/openconnect-7.06
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) sys-apps/iproute2 java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b1f6e6bc88b5e2242e54a87300a49451
diff --git a/metadata/md5-cache/net-misc/openconnect-7.06-r1 b/metadata/md5-cache/net-misc/openconnect-7.06-r1
index a5174a7bbc72..eccb353607cc 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.06-r1
+++ b/metadata/md5-cache/net-misc/openconnect-7.06-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e69c0e1ea9e3b8034ced182eed07b7f6
diff --git a/metadata/md5-cache/net-misc/openconnect-7.06-r2 b/metadata/md5-cache/net-misc/openconnect-7.06-r2
index db69f679d6f0..f3fd029829bf 100644
--- a/metadata/md5-cache/net-misc/openconnect-7.06-r2
+++ b/metadata/md5-cache/net-misc/openconnect-7.06-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-7.06.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=378fe6b6f40f53a32fe2b99f6e6ad524
diff --git a/metadata/md5-cache/net-misc/openconnect-9999 b/metadata/md5-cache/net-misc/openconnect-9999
index 2f895f4436d3..cb159aa5231b 100644
--- a/metadata/md5-cache/net-misc/openconnect-9999
+++ b/metadata/md5-cache/net-misc/openconnect-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) ) gnutls? ( >=net-libs/gnutls-3[static-libs?] dev-libs/nettle app-misc/ca-certificates ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) sys-apps/iproute2 !<sys-apps/openrc-0.13 java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20140806.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8a5b781481261ffa0d5c18dcb36df0c
diff --git a/metadata/md5-cache/net-misc/rygel-0.28.2-r1 b/metadata/md5-cache/net-misc/rygel-0.28.2-r1
index bf7570a7e757..758eb5f6024a 100644
--- a/metadata/md5-cache/net-misc/rygel-0.28.2-r1
+++ b/metadata/md5-cache/net-misc/rygel-0.28.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
 IUSE=X +introspection +sqlite tracker test transcode test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gupnp-dlna-0.9.4:2.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmediaart-0.7:2.0 media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-0.13 >=net-libs/gupnp-0.20.14 >=net-libs/gupnp-av-0.12.4 >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= ) tracker? ( >=app-misc/tracker-0.16:= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) X? ( >=x11-libs/gtk+-3:3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rygel/0.28/rygel-0.28.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2208f63f3e1da0fa7363c8198608d44f
+_md5_=1b3e9d02df91ede583ee1abad21e34b9
diff --git a/metadata/md5-cache/net-misc/termtter-2.2.3 b/metadata/md5-cache/net-misc/termtter-2.2.3
index d86f84ed3eae..fcd141dfb03d 100644
--- a/metadata/md5-cache/net-misc/termtter-2.2.3
+++ b/metadata/md5-cache/net-misc/termtter-2.2.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/json[ruby_targets_ruby20] dev-ruby/highl
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/termtter-2.2.3.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7e164d6e1024dd841fe3c9ccb54b5e6
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r1 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r1
index 6d6e29609bbd..48e13a1a5e2d 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.15* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.0-patches-0.2.tar.bz2 https://dev.gentoo.org/~armin76/dist/tigervnc-1.3.0-patches-0.2.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.15.0.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad7571efe07c3c1de402061400970718
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r2 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r2
index f61ef9cb1574..9bf94555cf35 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.16* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.1-patches-0.1.tar.bz2 https://dev.gentoo.org/~armin76/dist/tigervnc-1.3.1-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.16.0.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=83b1475f860eda8b22214fb2c4b8eab8
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r3 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r3
index 639fdeb2dc11..3d3ade154f55 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r3
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.15* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.0-patches-0.2.tar.bz2 https://dev.gentoo.org/~armin76/dist/tigervnc-1.3.0-patches-0.2.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.15.0.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=94275f0bd50065580d74f2cd58f4e36e
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4 b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
index 5c71184dc41c..47503220f395 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
+++ b/metadata/md5-cache/net-misc/tigervnc-1.3.1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.16* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tigervnc/tigervnc-1.3.1.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.3.1-patches-0.1.tar.bz2 https://dev.gentoo.org/~armin76/dist/tigervnc-1.3.1-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.16.0.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c1b759617e639dda2f81891c54caeb9a
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.4.2-r1 b/metadata/md5-cache/net-misc/tigervnc-1.4.2-r1
index b5147d4fc2ec..4e824104e434 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.4.2-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.16* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.4.2.tar.gz -> tigervnc-1.4.2.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.4.2-patches-0.1.tar.bz2 https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.16.4.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7a182e9cb6c4e8d3164738c43b4792ac
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.4.2-r2 b/metadata/md5-cache/net-misc/tigervnc-1.4.2-r2
index 43d9f4a7fcd4..8e91b18121f1 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.4.2-r2
+++ b/metadata/md5-cache/net-misc/tigervnc-1.4.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) xorgmodule? ( =x11-base/xorg-server-1.17* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.4.2.tar.gz -> tigervnc-1.4.2.tar.gz mirror://gentoo/tigervnc.png mirror://gentoo/tigervnc-1.4.2-patches-0.1.tar.bz2 https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.17.1.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=16cbfb5b13ffbcf595ee4454b7e4c37f
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.6.0-r1 b/metadata/md5-cache/net-misc/tigervnc-1.6.0-r1
index f6a3b5676f02..2ed6e9147acb 100644
--- a/metadata/md5-cache/net-misc/tigervnc-1.6.0-r1
+++ b/metadata/md5-cache/net-misc/tigervnc-1.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 sys-libs/zlib >=x11-libs/libXtst-1.0.99.2 >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls ) java? ( >=virtual/jre-1.5 ) pam? ( virtual/pam ) server? ( dev-lang/perl >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 x11-libs/libXrender >=x11-libs/pixman-0.27.2 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) xorgmodule? ( =x11-base/xorg-server-1.18* ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=https://github.com/TigerVNC/tigervnc/archive/v1.6.0.tar.gz -> tigervnc-1.6.0.tar.gz mirror://gentoo/tigervnc.png https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.18.0.tar.bz2 )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4fb23e8ae22f6faa296e2f6737871b36
diff --git a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2 b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
index ec1fe54c360d..98ea6abb3778 100644
--- a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
+++ b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2 mirror://gentoo/tightvnc.png java? ( mirror://sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fc871be4851c8eb59641db4204cfbcd
diff --git a/metadata/md5-cache/net-misc/vinagre-3.18.2 b/metadata/md5-cache/net-misc/vinagre-3.18.2
index 7d422db057a8..066547b62829 100644
--- a/metadata/md5-cache/net-misc/vinagre-3.18.2
+++ b/metadata/md5-cache/net-misc/vinagre-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=VNC client for the GNOME desktop
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Vinagre
 IUSE=rdp +ssh spice +telepathy zeroconf
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-themes/hicolor-icon-theme rdp? ( net-misc/freerdp ) ssh? ( >=x11-libs/vte-0.20:2.91 ) spice? ( app-emulation/spice-protocol >=net-misc/spice-gtk-0.5[gtk3] ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) zeroconf? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vinagre/3.18/vinagre-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=09c055cf0453a447035295a8bd503735
+_md5_=8200f7bc3ed6a4171b98446e670935d1
diff --git a/metadata/md5-cache/net-misc/vino-3.18.1 b/metadata/md5-cache/net-misc/vino-3.18.1
index e00be8e3d99f..d8607103f91c 100644
--- a/metadata/md5-cache/net-misc/vino-3.18.1
+++ b/metadata/md5-cache/net-misc/vino-3.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=An integrated VNC server for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Vino
 IUSE=crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libgcrypt-1.1.90:0= >=x11-libs/gtk+-3:3 dev-libs/dbus-glib x11-libs/cairo:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/pango[X] >=x11-libs/libnotify-0.7.0:= crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) gnome-keyring? ( app-crypt/libsecret ) jpeg? ( virtual/jpeg:0= ) ssl? ( >=net-libs/gnutls-2.2.0:= ) telepathy? ( >=net-libs/telepathy-glib-0.18 ) zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=jpeg? ( zlib )
 SLOT=0
 SRC_URI=mirror://gnome/sources/vino/3.18/vino-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=4ff7728e69f1a73ffcc98e4fc3a5ab03
+_md5_=f10467e68578791f2800bf8d23bb9617
diff --git a/metadata/md5-cache/net-misc/yajhfc-0.5.2 b/metadata/md5-cache/net-misc/yajhfc-0.5.2
index 6b23f181e074..c6bc754d9b41 100644
--- a/metadata/md5-cache/net-misc/yajhfc-0.5.2
+++ b/metadata/md5-cache/net-misc/yajhfc-0.5.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jdk-1.4 >=virtual/jre-1.4 java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://download.yajhfc.de/releases/yajhfc-0_5_2.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=885a8f2adf088e578eabe029b76a28b4
diff --git a/metadata/md5-cache/net-misc/yajhfc-0.5.7 b/metadata/md5-cache/net-misc/yajhfc-0.5.7
index 675358e19026..1227f00295a9 100644
--- a/metadata/md5-cache/net-misc/yajhfc-0.5.7
+++ b/metadata/md5-cache/net-misc/yajhfc-0.5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/gnu-hylafax:0 dev-java/tablelayout:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://download.yajhfc.de/releases/yajhfc-0_5_7-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a2847e04c30f6f0c1e568b07017c7c28
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2 b/metadata/md5-cache/net-nds/jxplorer-3.2
index ae0ce3db1604..f36832a42949 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.2
+++ b/metadata/md5-cache/net-nds/jxplorer-3.2
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/javahelp-2.0.02_p46 >=dev-java/log4j-1.2.8 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/JXv3.2src.tar.bz2 mirror://sourceforge/jxplorer/JXv3.2deploy.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ef6e74bad7071eb75ea28afe4fdd0a1
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.2-r2 b/metadata/md5-cache/net-nds/jxplorer-3.2-r2
index 77a7da5aed30..8336f51e67f4 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.2-r2
+++ b/metadata/md5-cache/net-nds/jxplorer-3.2-r2
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.4 >=dev-java/javahelp-2.0.02_p46 >=dev-java/log4j-1.2.8 =dev-java/junit-3.8* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/JXv3.2src.tar.bz2 mirror://sourceforge/jxplorer/JXv3.2deploy.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f126dc58131aeec93001fec4d5e2cbd9
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1
index 060159b39420..aceedd516fc7 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javahelp-2.0.02_p46:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1-project.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=597c9d2a2dec17c7fe461fd3f111438c
diff --git a/metadata/md5-cache/net-nds/jxplorer-3.3.1.1 b/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
index ee6863366e90..e3d20fe3aafe 100644
--- a/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
+++ b/metadata/md5-cache/net-nds/jxplorer-3.3.1.1
@@ -9,5 +9,5 @@ LICENSE=CAOSL
 RDEPEND=>=virtual/jre-1.5 >=dev-java/javahelp-2.0.02_p46:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jxplorer/jxplorer-3.3.1.1-project.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=1077049113db78406bc41b7acef566db
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1470 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1470
index ef0208442807..bdae63cc91f1 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1470
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1470
@@ -10,5 +10,5 @@ PDEPEND=net-libs/NativeThread:0
 RDEPEND=>=virtual/jre-1.6 net-libs/nativebiginteger:0 dev-java/bcprov:1.52 dev-java/commons-compress:0 dev-db/db-je:3.3 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/db4o-jdk11:0 dev-java/db4o-jdk12:0 dev-java/db4o-jdk5:0 dev-java/jbitcollider-core:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01470.zip -> freenet-0.7.5_p1470.zip mirror://gentoo/seednodes-20150812.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91137c31c63db613b68cb8a21cfc6c2f
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.22 b/metadata/md5-cache/net-p2p/i2p-0.9.22
index 34a573285232..a52063832ed3 100644
--- a/metadata/md5-cache/net-p2p/i2p-0.9.22
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.22
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 G
 RDEPEND=dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/java-service-wrapper:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.22/i2psource_0.9.22.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ef2fea5b12b5062c68b2c9a00187e038
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.22-r1 b/metadata/md5-cache/net-p2p/i2p-0.9.22-r1
index 6604afa09b8f..d050d7c75403 100644
--- a/metadata/md5-cache/net-p2p/i2p-0.9.22-r1
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.22-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 G
 RDEPEND=dev-java/jrobin:0 dev-java/bcprov:1.50 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.22/i2psource_0.9.22.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c7115025975c00690c2adbe106821ad1
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.23 b/metadata/md5-cache/net-p2p/i2p-0.9.23
index d75c93a10401..0352f40bd80b 100644
--- a/metadata/md5-cache/net-p2p/i2p-0.9.23
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.23
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 G
 RDEPEND=dev-java/jrobin:0 dev-java/bcprov:1.50 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.23/i2psource_0.9.23.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=175aadb370f40aa911b2afbd1622abf7
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.24 b/metadata/md5-cache/net-p2p/i2p-0.9.24
index e90be493861b..1cea808f3fb4 100644
--- a/metadata/md5-cache/net-p2p/i2p-0.9.24
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.24
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 G
 RDEPEND=dev-java/jrobin:0 dev-java/bcprov:1.50 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.24/i2psource_0.9.24.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e987f1bac4f8de643e22b41b32c0578a
diff --git a/metadata/md5-cache/net-p2p/myster-8.0-r1 b/metadata/md5-cache/net-p2p/myster-8.0-r1
index 552e6fac257b..c1effc72ac48 100644
--- a/metadata/md5-cache/net-p2p/myster-8.0-r1
+++ b/metadata/md5-cache/net-p2p/myster-8.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/myster/Myster_PR8_Generic.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54a9cf30fe6cbfda80dfaed8e0c65783
diff --git a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1 b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
index 6d98c51a1214..ab66b4893ce8 100644
--- a/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
+++ b/metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-4.8.1.2
 RDEPEND=dev-java/json-simple:0 dev-java/bcprov:1.40 >=dev-java/commons-cli-1.0:1 >=dev-java/log4j-1.2.8:0 >=dev-java/swt-3.7.2-r1:3.7[cairo] >=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_4812/Vuze_4812_source.zip mirror://gentoo/vuze-4.5.0.2-gentoo-patches.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f072db52ad9edf68f89cfded0c22ffa
diff --git a/metadata/md5-cache/net-p2p/vuze-5.3.0.0 b/metadata/md5-cache/net-p2p/vuze-5.3.0.0
index 47566f904797..2c7af27cf72c 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.3.0.0
+++ b/metadata/md5-cache/net-p2p/vuze-5.3.0.0
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-5.3.0.0
 RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5300/Vuze_5300_source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52a7750f5f0ae53ca0f436841c3e5f38
diff --git a/metadata/md5-cache/net-p2p/vuze-5.6.0.0 b/metadata/md5-cache/net-p2p/vuze-5.6.0.0
index 0e0522e165a0..11a9eff75695 100644
--- a/metadata/md5-cache/net-p2p/vuze-5.6.0.0
+++ b/metadata/md5-cache/net-p2p/vuze-5.6.0.0
@@ -10,5 +10,5 @@ PDEPEND=~net-p2p/vuze-coreplugins-5.6.0.0
 RDEPEND=dev-java/commons-cli:1 dev-java/commons-lang:2.1 dev-java/json-simple:0 dev-java/log4j:0 dev-java/swt:3.8[cairo] >=virtual/jre-1.6:* >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/azureus/vuze/Vuze_5600/Vuze_5600_source.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fab6505857b81f67c6187cd120afd5a9
diff --git a/metadata/md5-cache/net-p2p/yaggui-0.9.2 b/metadata/md5-cache/net-p2p/yaggui-0.9.2
index a32f7ec10e89..1a9f05eed071 100644
--- a/metadata/md5-cache/net-p2p/yaggui-0.9.2
+++ b/metadata/md5-cache/net-p2p/yaggui-0.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 =dev-java/jgoodies-looks-1.2* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/yaggui/Yaggui-src-0.9.2.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2d1b15d10a25c7bd48f0d63d6541cc4
diff --git a/metadata/md5-cache/net-print/cups-2.0.3 b/metadata/md5-cache/net-print/cups-2.0.3
index 57bc346ce159..45c41ee2eb2f 100644
--- a/metadata/md5-cache/net-print/cups-2.0.3
+++ b/metadata/md5-cache/net-print/cups-2.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.3/cups-2.0.3-source.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4d82b0a90ef189e2ab0ef3983f17915c
diff --git a/metadata/md5-cache/net-print/cups-2.0.4 b/metadata/md5-cache/net-print/cups-2.0.4
index b5a26e0c81e4..f8976c225bce 100644
--- a/metadata/md5-cache/net-print/cups-2.0.4
+++ b/metadata/md5-cache/net-print/cups-2.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.4/cups-2.0.4-source.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=87bccf89e01f32dd0d95cef3fb788605
diff --git a/metadata/md5-cache/net-print/cups-2.1.2-r2 b/metadata/md5-cache/net-print/cups-2.1.2-r2
index 03e1410c4e31..9f6d112b3ba3 100644
--- a/metadata/md5-cache/net-print/cups-2.1.2-r2
+++ b/metadata/md5-cache/net-print/cups-2.1.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.1.2/cups-2.1.2-source.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=319e7e1bbd3a6a7da928c13530d9cffd
diff --git a/metadata/md5-cache/net-print/cups-2.1.3 b/metadata/md5-cache/net-print/cups-2.1.3
index fd7d757d8dda..41ae2a500204 100644
--- a/metadata/md5-cache/net-print/cups-2.1.3
+++ b/metadata/md5-cache/net-print/cups-2.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.1.3/cups-2.1.3-source.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=947f2a74e20e90784df8fff3f9af369d
diff --git a/metadata/md5-cache/net-print/cups-2.1.3-r1 b/metadata/md5-cache/net-print/cups-2.1.3-r1
index a39614975538..50b3e277f13c 100644
--- a/metadata/md5-cache/net-print/cups-2.1.3-r1
+++ b/metadata/md5-cache/net-print/cups-2.1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.1.3/cups-2.1.3-source.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b4a4ed1115240803d2c0d806b9628657
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 89387acaa82a..bfd20510aaf3 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4624776c911cd66ee1ed7e6d8b9212ab
diff --git a/metadata/md5-cache/net-print/cups-pk-helper-0.2.6 b/metadata/md5-cache/net-print/cups-pk-helper-0.2.6
index 106d19559cfa..58bcb744bcc4 100644
--- a/metadata/md5-cache/net-print/cups-pk-helper-0.2.6
+++ b/metadata/md5-cache/net-print/cups-pk-helper-0.2.6
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.30.0:2 net-print/cups >=sys-auth/polkit-0.97 >=dev-util
 DESCRIPTION=PolicyKit helper to configure cups with fine-grained privileges
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/cups-pk-helper
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.30.0:2 net-print/cups >=sys-auth/polkit-0.97 sys-apps/dbus
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-0.2.6.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=45b83db72c4184764c29cf1ab8d9d775
+_md5_=9394967415c6e3ca07ffa654fd7ca98d
diff --git a/metadata/md5-cache/net-print/gmso2-0.1-r1 b/metadata/md5-cache/net-print/gmso2-0.1-r1
index 1a0fba7751d3..c1d979f82f30 100644
--- a/metadata/md5-cache/net-print/gmso2-0.1-r1
+++ b/metadata/md5-cache/net-print/gmso2-0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/libmso:0 dev-java/jinklevel:0 >=dev-java/java-gnome-4.0.15:4.0 >=virtual/jre-1.5 x11-libs/gksu >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mso.googlecode.com/files/gmso2-0.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56296916235a5d5a5d69dafa3294cd38
diff --git a/metadata/md5-cache/net-voip/vidyodesktop-3.5.4.010 b/metadata/md5-cache/net-voip/vidyodesktop-3.5.4.010
new file mode 100644
index 000000000000..ec5e22cf32c4
--- /dev/null
+++ b/metadata/md5-cache/net-voip/vidyodesktop-3.5.4.010
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Enterprise video conferencing platform
+EAPI=5
+HOMEPAGE=http://www.vidyo.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=Vidyo-EULA
+RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/glib dev-libs/libffi sys-apps/util-linux sys-libs/glibc sys-devel/gcc media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/glu media-libs/libpng media-libs/mesa net-dns/libidn sys-libs/zlib x11-libs/libdrm x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXv x11-libs/libXxf86vm dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://demo.vidyo.com/upload/VidyoDesktopInstaller-ubuntu64-TAG_VD_3_5_4_010.deb ) x86? ( https://demo.vidyo.com/upload/VidyoDesktopInstaller-ubuntu-TAG_VD_3_5_4_010.deb )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=738d80cd4a51b07fa5241bafed00afa5
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.18.2 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.18.2
index 02a39f96f186..d7ad4a9fc186 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.18.2
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=Bluetooth graphical utilities integrated with GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeBluetooth
 IUSE=+introspection debug
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.12:3[introspection?] x11-libs/libnotify virtual/udev introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) >=net-wireless/bluez-5
 SLOT=2/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a5ab6b51a20f4af6231152327c857af8
+_md5_=e8f7bcf7099ef08164c9307180be8617
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
index ee2d046b19f5..dd82a60dd293 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
@@ -10,5 +10,5 @@ RDEPEND=ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20?
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/lorcon-0.0_p20150109.tar.xz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=37335c28d02aa1f05c95877e2a354f8b
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index bdb3bab4ce6a..3048480b2a3a 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-libs/libnl:3= net-libs/libpcap
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91216409ab337d29f035882ba6713407
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.3.1 b/metadata/md5-cache/sci-astronomy/cpl-6.3.1
index db8ec7952111..62ca38d49015 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.3.1
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.310 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.3.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=015fee50c2549e20fadefaf401b9604a
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.4 b/metadata/md5-cache/sci-astronomy/cpl-6.4
index 81859adee608..f8f1d4cda12f 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.4
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-astronomy/wcslib-4.8.4 >=sci-libs/cfitsio-3.310 >=sci-libs/fftw-3.1.2 gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/20
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.4.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fdf3fa8966fbcbeb38e4abbf9a932133
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.4.1 b/metadata/md5-cache/sci-astronomy/cpl-6.4.1
index 798af0e6ae60..43c2661f3f3f 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.4.1
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-astronomy/wcslib:0= >=sci-libs/cfitsio-3.310:0= sci-libs/fftw:3.0= gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/20
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.4.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c6b03bac403d2e3d54b46eb42911727
diff --git a/metadata/md5-cache/sci-astronomy/cpl-6.4.2 b/metadata/md5-cache/sci-astronomy/cpl-6.4.2
index c9ab7b081510..a0b1b6c24a19 100644
--- a/metadata/md5-cache/sci-astronomy/cpl-6.4.2
+++ b/metadata/md5-cache/sci-astronomy/cpl-6.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-astronomy/wcslib:0= >=sci-libs/cfitsio-3.310:0= sci-libs/fftw:3.0= gasgano? ( sci-astronomy/gasgano ) gasgano? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/20
 SRC_URI=ftp://ftp.eso.org/pub/dfs/pipelines/libraries/cpl/cpl-6.4.2.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c6b03bac403d2e3d54b46eb42911727
diff --git a/metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2 b/metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2
index d80393e434d2..64b2fd21888b 100644
--- a/metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2
+++ b/metadata/md5-cache/sci-astronomy/gasgano-2.4.3-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 dev-java/gnu-regexp dev-java/junit dev-java/jal >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/gasgano/gasgano-2.4.3.tar.gz doc? ( http://www.eso.org/sci/software/gasgano//VLT-PRO-ESO-19000-1932-V4.pdf )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=905351b450e6b6a45d72d89ea748412a
diff --git a/metadata/md5-cache/sci-astronomy/gasgano-2.4.5 b/metadata/md5-cache/sci-astronomy/gasgano-2.4.5
index 13011a3e9ab3..12e5e3e74624 100644
--- a/metadata/md5-cache/sci-astronomy/gasgano-2.4.5
+++ b/metadata/md5-cache/sci-astronomy/gasgano-2.4.5
@@ -9,5 +9,5 @@ LICENSE=Apache-1.1
 RDEPEND=>=virtual/jre-1.6 dev-java/gnu-regexp dev-java/junit dev-java/jal >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=ftp://ftp.eso.org/pub/dfs/gasgano/gasgano-2.4.5.tar.gz doc? ( http://www.eso.org/sci/software/gasgano//VLT-PRO-ESO-19000-1932-V4.pdf )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=469421f6e38d8641789929cbf3b4ddc8
diff --git a/metadata/md5-cache/sci-astronomy/wcstools-3.9.2 b/metadata/md5-cache/sci-astronomy/wcstools-3.9.2
new file mode 100644
index 000000000000..e18d247c8c86
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/wcstools-3.9.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+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
+DESCRIPTION=World Coordinate System library for astronomical FITS images
+EAPI=5
+HOMEPAGE=http://tdc-www.harvard.edu/software/wcstools
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2.1
+SLOT=0
+SRC_URI=http://tdc-www.harvard.edu/software/wcstools/wcstools-3.9.2.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=2554171c2c761121cdab1af20d0d2ef1
diff --git a/metadata/md5-cache/sci-biology/amap-2.2-r2 b/metadata/md5-cache/sci-biology/amap-2.2-r2
index 74f25edde8cb..c2e99b249238 100644
--- a/metadata/md5-cache/sci-biology/amap-2.2-r2
+++ b/metadata/md5-cache/sci-biology/amap-2.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://baboon.math.berkeley.edu/amap/download/amap.2.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8010150e6242df5d294ab35b887af2a1
diff --git a/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5-r1 b/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5-r1
index e507047b3605..1a161c2b5aa0 100644
--- a/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5-r1
+++ b/metadata/md5-cache/sci-biology/beast-mcmc-1.7.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/colt:0 dev-java/jdom:0 dev-java/itext:0 dev-java/junit:4 dev-java/jebl:0 dev-java/matrix-toolkits-java dev-java/commons-math:2 dev-java/jdom-jaxen:1.0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/beast-mcmc-1.7.5.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78a597e327e0b56f4074f590ef3eca4c
diff --git a/metadata/md5-cache/sci-biology/beast-mcmc-9999 b/metadata/md5-cache/sci-biology/beast-mcmc-9999
index 23caf8b72cef..089bbf655f52 100644
--- a/metadata/md5-cache/sci-biology/beast-mcmc-9999
+++ b/metadata/md5-cache/sci-biology/beast-mcmc-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=LGPL-3
 RDEPEND=>=virtual/jre-1.5 dev-java/colt:0 dev-java/jdom:0 dev-java/itext:0 dev-java/junit:4 dev-java/jebl:0 dev-java/matrix-toolkits-java dev-java/commons-math:2 dev-java/jdom-jaxen:1.0 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91fd25b95c1888b46de27b583565e9d0
diff --git a/metadata/md5-cache/sci-biology/biojava-1.6 b/metadata/md5-cache/sci-biology/biojava-1.6
index 86777a70c087..6889d0721ec7 100644
--- a/metadata/md5-cache/sci-biology/biojava-1.6
+++ b/metadata/md5-cache/sci-biology/biojava-1.6
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/jgrapht:0 dev-java/commons-cli:1 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/bytecode:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.biojava.org/download/bj16/all/biojava-1.6-all.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6688ef964fc070940ba928fdf9aa6a34
diff --git a/metadata/md5-cache/sci-biology/biojava-1.7 b/metadata/md5-cache/sci-biology/biojava-1.7
index 9f7ea0785f8e..2134340c4c46 100644
--- a/metadata/md5-cache/sci-biology/biojava-1.7
+++ b/metadata/md5-cache/sci-biology/biojava-1.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/jgrapht:0 dev-java/commons-cli:1 dev-java/commons-dbcp:0 dev-java/commons-pool:0 dev-java/commons-collections:0 dev-java/bytecode:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.biojava.org/download/bj17/all/biojava-1.7-all.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=24165f27c9292073c1a3f5e9ce3f8e08
diff --git a/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1 b/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
index a0f2b8cce103..ed6c07abd923 100644
--- a/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
+++ b/metadata/md5-cache/sci-biology/bioruby-1.4.3.0001-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( dev-ruby/libxml[ruby_targets_ruby19] ) ruby_targe
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.bioruby.org/archive/bioruby-1.4.3.0001.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2e3ab118681734c22fa66476255ff94
diff --git a/metadata/md5-cache/sci-biology/bioruby-9999 b/metadata/md5-cache/sci-biology/bioruby-9999
index c87b0f9a6fba..3c445063272b 100644
--- a/metadata/md5-cache/sci-biology/bioruby-9999
+++ b/metadata/md5-cache/sci-biology/bioruby-9999
@@ -8,5 +8,5 @@ LICENSE=Ruby
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/libxml[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/libxml[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
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49603e20db4e0c27dc18df4376a7235c
diff --git a/metadata/md5-cache/sci-biology/gatk-2.4 b/metadata/md5-cache/sci-biology/gatk-2.4
index 3fb2e732d5d6..db4029f6faed 100644
--- a/metadata/md5-cache/sci-biology/gatk-2.4
+++ b/metadata/md5-cache/sci-biology/gatk-2.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/broadgsa/gatk/archive/2.4.tar.gz -> gatk-2.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e7edd964ee7eedfb9d0941dd49b840e
diff --git a/metadata/md5-cache/sci-biology/gatk-9999 b/metadata/md5-cache/sci-biology/gatk-9999
index d7134f72fbb2..9cdc1a87f7d3 100644
--- a/metadata/md5-cache/sci-biology/gatk-9999
+++ b/metadata/md5-cache/sci-biology/gatk-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87fbeadb7427c25b13f5837263f8939f
diff --git a/metadata/md5-cache/sci-biology/goby-1.9.7.3 b/metadata/md5-cache/sci-biology/goby-1.9.7.3
index 5586ed0c1e95..225a89eb33d1 100644
--- a/metadata/md5-cache/sci-biology/goby-1.9.7.3
+++ b/metadata/md5-cache/sci-biology/goby-1.9.7.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/commons-lang:2.1 dev-java/commons-io:1 dev-libs/protobuf[java] dev-java/fastutil:5.0 dev-java/log4j dev-java/jsap dev-java/commons-configuration dev-java/commons-math:2 cpp? ( ~sci-biology/goby-cpp-1.9.7.3 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.7.3/goby_1.9.7.3-src.zip http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.7.3/goby_1.9.7.3-deps.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b122a674c7d130e120b6eb97c3bff77
diff --git a/metadata/md5-cache/sci-biology/goby-1.9.8.1 b/metadata/md5-cache/sci-biology/goby-1.9.8.1
index 997d20c1e804..b136ae4a714b 100644
--- a/metadata/md5-cache/sci-biology/goby-1.9.8.1
+++ b/metadata/md5-cache/sci-biology/goby-1.9.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging dev-java/commons-lang:2.1 dev-java/commons-io:1 dev-libs/protobuf[java] dev-java/fastutil:5.0 dev-java/log4j dev-java/jsap dev-java/commons-configuration dev-java/commons-math:2 cpp? ( ~sci-biology/goby-cpp-1.9.8.1 ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.8.1/goby_1.9.8.1-src.zip http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.8.1/goby_1.9.8.1-deps.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cf94833e9cddf4257293422c8a1dd488
diff --git a/metadata/md5-cache/sci-biology/mauve-9999 b/metadata/md5-cache/sci-biology/mauve-9999
index 0ec1635667a0..a261a0333efd 100644
--- a/metadata/md5-cache/sci-biology/mauve-9999
+++ b/metadata/md5-cache/sci-biology/mauve-9999
@@ -7,5 +7,5 @@ IUSE=doc elibc_FreeBSD elibc_FreeBSD
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.5 sci-biology/mauvealigner ~sci-biology/biojava-1.6 >=dev-java/dbus-java-2.5.1 ~dev-java/zeus-jscl-1.08 dev-java/ant-nodeps >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=857bc190da1f1eaaaf30424cee8f4d88
diff --git a/metadata/md5-cache/sci-biology/picard-1.103 b/metadata/md5-cache/sci-biology/picard-1.103
index c60157e46fd5..3a491e6c525b 100644
--- a/metadata/md5-cache/sci-biology/picard-1.103
+++ b/metadata/md5-cache/sci-biology/picard-1.103
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/snappy:1.0 dev-java/cofoja:0 dev-java/commons-jexl:2 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/sci-biology/picard/picard-1.103.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f33422ec9832c259cea81a18a74a8503
diff --git a/metadata/md5-cache/sci-biology/readseq-20080420-r1 b/metadata/md5-cache/sci-biology/readseq-20080420-r1
index 88af7e9ee1c5..37fd2eed0e35 100644
--- a/metadata/md5-cache/sci-biology/readseq-20080420-r1
+++ b/metadata/md5-cache/sci-biology/readseq-20080420-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=!=sci-biology/meme-4.8.1 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dberkholz/distfiles/readseq-source-20080420.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2f6328657ec6c6a3348b6f206e57854
diff --git a/metadata/md5-cache/sci-biology/readseq-20100513 b/metadata/md5-cache/sci-biology/readseq-20100513
index 31a805472920..f349adfba8fc 100644
--- a/metadata/md5-cache/sci-biology/readseq-20100513
+++ b/metadata/md5-cache/sci-biology/readseq-20100513
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=!=sci-biology/meme-4.8.1 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/sci-biology/readseq/readseq-20100513.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3cbc3bbddd9b0dbc36233f8b8ffd58a
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1 b/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
index 468e927666b7..6f27115307ac 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.0.45-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.4 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jmol/Jmol-12.0.45-full.tar.gz https://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=344f26c4571e62ef76b04b008419a56a
diff --git a/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1 b/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
index 03ba3f8a6bef..a28180bc26b9 100644
--- a/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
+++ b/metadata/md5-cache/sci-chemistry/jmol-12.2.27-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/jre-1.5 dev-java/commons-cli:1 dev-java/itext:0 sci-libs/jmol-acme:0 sci-libs/vecmath-objectclub:0 sci-libs/naga >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/jmol/Jmol-12.2.27-full.tar.gz https://dev.gentoo.org/~jlec/distfiles/jmol-selfSignedCertificate.store.tar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=a84348f9ecb81cfbc6c04381aa01cc25
diff --git a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-0_p15 b/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-0_p15
deleted file mode 100644
index e13fa88090ba..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-0_p15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1 =dev-lang/python-2*
-DESCRIPTION=APBS plugin for pymol
-EAPI=3
-HOMEPAGE=http://sourceforge.net/projects/pymolapbsplugin/
-KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=pymol
-RDEPEND=sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=15 -> pymol-apbs-plugin-0_p15.py
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=805bd9d445575c897fa07ed96737176c
diff --git a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-0_p18 b/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-0_p18
deleted file mode 100644
index 4d725d002512..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-0_p18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1 =dev-lang/python-2*
-DESCRIPTION=APBS plugin for pymol
-EAPI=3
-HOMEPAGE=http://sourceforge.net/projects/pymolapbsplugin/
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=pymol
-RDEPEND=sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=18 -> pymol-apbs-plugin-0_p18.py
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fb98903e1bc53319f11552e03a1c5a4a
diff --git a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p24 b/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p24
deleted file mode 100644
index 3eb2b42e3850..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p24
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1 =dev-lang/python-2*
-DESCRIPTION=APBS plugin for pymol
-EAPI=3
-HOMEPAGE=http://sourceforge.net/projects/pymolapbsplugin/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=pymol
-RDEPEND=sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=24 -> pymol-apbs-plugin-2.1_p24.py
-_eclasses_=multilib	3972ca401cf7dbb430df9995f5d8d580	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=977c0736442d1084c59c2ec848002f2c
diff --git a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26 b/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26
deleted file mode 100644
index 5ca1e5195ae1..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1
-DESCRIPTION=APBS plugin for pymol
-EAPI=5
-HOMEPAGE=http://sourceforge.net/projects/pymolapbsplugin/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=pymol
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://sourceforge.net/p/pymolapbsplugin/code/26/tree/trunk/src/apbsplugin.py?format=raw -> pymol-apbs-plugin-2.1_p26.py
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=72c2dd2d3a9690786580f060b6129707
diff --git a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26-r1 b/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26-r1
deleted file mode 100644
index 4ef9c0d89f13..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-apbs-plugin-2.1_p26-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1
-DESCRIPTION=APBS plugin for pymol
-EAPI=5
-HOMEPAGE=http://sourceforge.net/projects/pymolapbsplugin/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=pymol
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/apbs sci-chemistry/pdb2pqr !<sci-chemistry/pymol-1.2.2-r1
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://sourceforge.net/p/pymolapbsplugin/code/26/tree/trunk/src/apbsplugin.py?format=raw -> pymol-apbs-plugin-2.1_p26.py
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=9d18fb1cbf42bba061ca3e8d022e7d95
diff --git a/metadata/md5-cache/sci-chemistry/pymol-plugins-caver-2.1.2 b/metadata/md5-cache/sci-chemistry/pymol-plugins-caver-2.1.2
index d2e5c73750e2..03bcea093ab7 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-plugins-caver-2.1.2
+++ b/metadata/md5-cache/sci-chemistry/pymol-plugins-caver-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.6 sci-chemistry/pymol[python_targets_python2_7(-)?,-pyth
 RESTRICT=fetch
 SLOT=0
 SRC_URI=Caver2_1_2_pymol_plugin.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b01972a4c7e813af579eace8726bf41c
diff --git a/metadata/md5-cache/sci-chemistry/tinker-7.1.2 b/metadata/md5-cache/sci-chemistry/tinker-7.1.2
index b17a84022db8..2912b237fae4 100644
--- a/metadata/md5-cache/sci-chemistry/tinker-7.1.2
+++ b/metadata/md5-cache/sci-chemistry/tinker-7.1.2
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/fftw-3.2.2-r1[fortran,threads] dev-libs/maloc !dev-util/diffu
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://dasher.wustl.edu/tinker/downloads/tinker-7.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b30aa1d71ca9c5930c4c2d0687126a83
diff --git a/metadata/md5-cache/sci-electronics/electric-8.09 b/metadata/md5-cache/sci-electronics/electric-8.09
index 6806f6c51993..243b7b790562 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.09
+++ b/metadata/md5-cache/sci-electronics/electric-8.09
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.09.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0267ef7f1079e2bc0b242556d7466885
diff --git a/metadata/md5-cache/sci-electronics/electric-8.11 b/metadata/md5-cache/sci-electronics/electric-8.11
index b0462b7ddeec..dca5281418d2 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.11
+++ b/metadata/md5-cache/sci-electronics/electric-8.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.11.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eee99ce51a7dfe167254187bc9cd60ac
diff --git a/metadata/md5-cache/sci-electronics/electric-9.02 b/metadata/md5-cache/sci-electronics/electric-9.02
index 5ec2f2c1d8c6..8f9b36c25cde 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.02
+++ b/metadata/md5-cache/sci-electronics/electric-9.02
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.02.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0267ef7f1079e2bc0b242556d7466885
diff --git a/metadata/md5-cache/sci-electronics/electric-9.03 b/metadata/md5-cache/sci-electronics/electric-9.03
index 74c8d03d0b53..b9116eb540d8 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.03
+++ b/metadata/md5-cache/sci-electronics/electric-9.03
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.03.jar
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eee99ce51a7dfe167254187bc9cd60ac
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.23.10 b/metadata/md5-cache/sci-electronics/klayout-0.23.10
index 099cde7b5291..478d07c82cfe 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.23.10
+++ b/metadata/md5-cache/sci-electronics/klayout-0.23.10
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:4[qt3support] ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://178.77.72.242/downloads/klayout-0.23.10.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4858ba1ecca4a5fe7ae3bfe0ef8bd4fb
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.0.3 b/metadata/md5-cache/sci-geosciences/bt747-2.0.3
index cb1206c491f6..adf31640f99a 100644
--- a/metadata/md5-cache/sci-geosciences/bt747-2.0.3
+++ b/metadata/md5-cache/sci-geosciences/bt747-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-java/rxtx-2.2_pre2 dev-java/swing-layout:1 dev-java/jcalendar:1.2 dev-java/jcharts dev-libs/glib:2[dbus] >=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://sourceforge/bt747/BT747_2.0.3_full.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0e25afc7381907f2077f6cc8d8c608a
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.1.3 b/metadata/md5-cache/sci-geosciences/bt747-2.1.3
index 12a8a357ab22..e4a1d68af014 100644
--- a/metadata/md5-cache/sci-geosciences/bt747-2.1.3
+++ b/metadata/md5-cache/sci-geosciences/bt747-2.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-java/commons-imaging:0 dev-java/jcalendar:1.2 dev-java/jchart2d:0 dev-java/jopt-simple:4.4 >=dev-java/rxtx-2.2_pre2:2 dev-java/swing-layout:1 dev-java/swingx:1.6 dev-java/swingx-ws:bt747 dev-libs/glib:2[dbus] >=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=1
 SRC_URI=mirror://sourceforge/bt747/Stable/BT747_2.1.3_full.zip http://www.bt747.org/icon/bt747_128x128.gif -> bt747.gif
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fc7b48e886cde0307311f16f974e8a0e
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.18.1 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.18.1
index 472c80aa5692..bb498bc09e06 100644
--- a/metadata/md5-cache/sci-geosciences/geocode-glib-3.18.1
+++ b/metadata/md5-cache/sci-geosciences/geocode-glib-3.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=GLib geocoding library that uses the Yahoo! Place Finder service
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/geocode-glib
 IUSE=+introspection test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.99.2[introspection?] gnome-base/gvfs[http] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.3:= net-libs/libsoup:2.4[introspection] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/geocode-glib/3.18/geocode-glib-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9beb06dc16d859b696fd29caeceb2303
+_md5_=2b41ce854d89a4c005581394d95cebde
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-3.18.2 b/metadata/md5-cache/sci-geosciences/gnome-maps-3.18.2
index d815aaf457ce..5c670af767e8 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-3.18.2
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-3.18.2
@@ -3,10 +3,10 @@ DEPEND=>=app-misc/geoclue-0.12.99:2.0 >=dev-libs/folks-0.10 >=dev-libs/gjs-1.43.
 DESCRIPTION=A map application for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=app-misc/geoclue-0.12.99:2.0 >=dev-libs/folks-0.10 >=dev-libs/gjs-1.43.3 >=dev-libs/gobject-introspection-0.6.3:= >=dev-libs/glib-2.39.3:2 >=dev-libs/libgee-0.16:0.8[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] media-libs/cogl:1.0[introspection] >=media-libs/libchamplain-0.12.10-r1:0.12[gtk,introspection] net-libs/libgfbgraph net-libs/libsoup:2.4[introspection] >=sci-geosciences/geocode-glib-3.15.2[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.15.9:3[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/3.18/gnome-maps-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=167dd0b0b6a231ca789a9248cde92ee0
+_md5_=daeabf2d370c86991c5be467d96c1a89
diff --git a/metadata/md5-cache/sci-geosciences/josm-5608 b/metadata/md5-cache/sci-geosciences/josm-5608
index b03efa017741..2d2d1d0bcf2e 100644
--- a/metadata/md5-cache/sci-geosciences/josm-5608
+++ b/metadata/md5-cache/sci-geosciences/josm-5608
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://josm.hboeck.de/josm-5608.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e46b7cfd055355f4ef110c11cf3120c
diff --git a/metadata/md5-cache/sci-geosciences/josm-6060 b/metadata/md5-cache/sci-geosciences/josm-6060
index f2683f6b67c7..a88cafe99a09 100644
--- a/metadata/md5-cache/sci-geosciences/josm-6060
+++ b/metadata/md5-cache/sci-geosciences/josm-6060
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://josm.hboeck.de/josm-6060.tar.xz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d42dc06ea136d9e255cc8ff04ef5073
diff --git a/metadata/md5-cache/sci-geosciences/josm-7347 b/metadata/md5-cache/sci-geosciences/josm-7347
index 4e4b4cfa9e34..2a5d612acea8 100644
--- a/metadata/md5-cache/sci-geosciences/josm-7347
+++ b/metadata/md5-cache/sci-geosciences/josm-7347
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/josm-7347.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c269603207204ece8a023f240407b2f
diff --git a/metadata/md5-cache/sci-geosciences/josm-8800 b/metadata/md5-cache/sci-geosciences/josm-8800
index 958b40261c5f..b35ef74fb95b 100644
--- a/metadata/md5-cache/sci-geosciences/josm-8800
+++ b/metadata/md5-cache/sci-geosciences/josm-8800
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/josm-8800.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d95af22f439301952d6c3c4e59f650f
diff --git a/metadata/md5-cache/sci-geosciences/josm-9060 b/metadata/md5-cache/sci-geosciences/josm-9060
index 9bbf547d3b41..e2a178a42461 100644
--- a/metadata/md5-cache/sci-geosciences/josm-9060
+++ b/metadata/md5-cache/sci-geosciences/josm-9060
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/josm-9060.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d95af22f439301952d6c3c4e59f650f
diff --git a/metadata/md5-cache/sci-geosciences/josm-9999 b/metadata/md5-cache/sci-geosciences/josm-9999
index cefae2d1774e..aac36a1b70b9 100644
--- a/metadata/md5-cache/sci-geosciences/josm-9999
+++ b/metadata/md5-cache/sci-geosciences/josm-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_FreeBSD
 LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7e16479521fa574f194ca9f8a51adf6
diff --git a/metadata/md5-cache/sci-geosciences/mkgmap-1995 b/metadata/md5-cache/sci-geosciences/mkgmap-1995
index d6ad766a9858..e5e13035766a 100644
--- a/metadata/md5-cache/sci-geosciences/mkgmap-1995
+++ b/metadata/md5-cache/sci-geosciences/mkgmap-1995
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.mkgmap.org.uk/snapshots/mkgmap-r1995-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5bad14762317d9d0aef8eda074e9e7ca
diff --git a/metadata/md5-cache/sci-geosciences/osmosis-0.35.1 b/metadata/md5-cache/sci-geosciences/osmosis-0.35.1
index 193791e5e83e..456c79ff2b8f 100644
--- a/metadata/md5-cache/sci-geosciences/osmosis-0.35.1
+++ b/metadata/md5-cache/sci-geosciences/osmosis-0.35.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://bretth.dev.openstreetmap.org/osmosis-build/osmosis-0.35.1.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=732044a2bef1da26463817a40e2f6372
diff --git a/metadata/md5-cache/sci-libs/cdf-3.4.1 b/metadata/md5-cache/sci-libs/cdf-3.4.1
index b7cc5b2c4c3d..032c16bfaa9e 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.4.1
+++ b/metadata/md5-cache/sci-libs/cdf-3.4.1
@@ -9,5 +9,5 @@ LICENSE=CDF
 RDEPEND=java? ( >=virtual/jre-1.5 ) ncurses? ( sys-libs/ncurses ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_1-dist-cdf.tar.gz java? ( ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_1-dist-java.tar.gz ) doc? ( ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34crm.pdf ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34frm.pdf ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34ifd.pdf ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34prm.pdf ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34ug.pdf java? ( ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf34_1/unix/cdf34_documentation/cdf34jrm.pdf ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1cc217f5b6912291000304ed0b339b79
diff --git a/metadata/md5-cache/sci-libs/cdf-3.5.0.2 b/metadata/md5-cache/sci-libs/cdf-3.5.0.2
index 5d441fec829a..f2f769aea236 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.5.0.2
+++ b/metadata/md5-cache/sci-libs/cdf-3.5.0.2
@@ -9,5 +9,5 @@ LICENSE=CDF
 RDEPEND=java? ( >=virtual/jre-1.5 ) ncurses? ( sys-libs/ncurses ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_0-dist-cdf.tar.gz java? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_0-dist-java.tar.gz ) doc? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350crm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350frm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf35ifd.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350prm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350ug.pdf java? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350jrm.pdf ) )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f6149bc0141bff830456412c895a6e2
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.38 b/metadata/md5-cache/sci-libs/cfitsio-3.38-r1
similarity index 100%
rename from metadata/md5-cache/sci-libs/cfitsio-3.38
rename to metadata/md5-cache/sci-libs/cfitsio-3.38-r1
diff --git a/metadata/md5-cache/sci-libs/gdal-1.11.1-r3 b/metadata/md5-cache/sci-libs/gdal-1.11.1-r3
index 8dab0243e623..56b495fb7d66 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.11.1-r3
+++ b/metadata/md5-cache/sci-libs/gdal-1.11.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-l
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a96fa5e2e8a3627cf00bed6578802a75
diff --git a/metadata/md5-cache/sci-libs/gdal-1.11.2 b/metadata/md5-cache/sci-libs/gdal-1.11.2
index 206f3f79d222..3e07e2b0b782 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.11.2
+++ b/metadata/md5-cache/sci-libs/gdal-1.11.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-l
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=62a06dfcd5cf88d8eaf9863e26c4ad8e
diff --git a/metadata/md5-cache/sci-libs/gdal-2.0.0 b/metadata/md5-cache/sci-libs/gdal-2.0.0
index 8432230c3d60..503d38f4148c 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.0.0
+++ b/metadata/md5-cache/sci-libs/gdal-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-l
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee467ec58e8eb54f1bba904bf21ef7b2
diff --git a/metadata/md5-cache/sci-libs/gdal-2.0.0-r1 b/metadata/md5-cache/sci-libs/gdal-2.0.0-r1
index 0c7703d87910..ef4e03698c45 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.0.0-r1
+++ b/metadata/md5-cache/sci-libs/gdal-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-l
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70e62c27ca4897bef450fd01fda013cf
diff --git a/metadata/md5-cache/sci-libs/gdal-2.0.1 b/metadata/md5-cache/sci-libs/gdal-2.0.1
index 8668595eb1e8..e8d20ee5a0d7 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.0.1
+++ b/metadata/md5-cache/sci-libs/gdal-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-l
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/2.0.1/gdal-2.0.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1abb975a6f205acd3fb7a97d48c6c669
diff --git a/metadata/md5-cache/sci-libs/jmol-acme-1.0 b/metadata/md5-cache/sci-libs/jmol-acme-1.0
index c4a58563498d..4cbc9f7d4e28 100644
--- a/metadata/md5-cache/sci-libs/jmol-acme-1.0
+++ b/metadata/md5-cache/sci-libs/jmol-acme-1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.acme.com/resources/classes/Acme.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd06c6a39e82cfb27b1a1753dfe8e511
diff --git a/metadata/md5-cache/sci-libs/libbufr-000405 b/metadata/md5-cache/sci-libs/libbufr-000405
deleted file mode 100644
index 21be456dfbb8..000000000000
--- a/metadata/md5-cache/sci-libs/libbufr-000405
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup test
-DEPEND=sys-apps/findutils virtual/fortran
-DESCRIPTION=ECMWF BUFR library - includes both C and Fortran example utilities
-EAPI=5
-HOMEPAGE=https://software.ecmwf.int/wiki/display/BUFR/BUFRDC+Home
-IUSE=debug doc examples lto
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=virtual/fortran virtual/fortran
-SLOT=0
-SRC_URI=https://software.ecmwf.int/wiki/download/attachments/35752466/bufrdc_000405.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=131898317397c6b25a679cf1b3fc97b1
diff --git a/metadata/md5-cache/sci-libs/libsigrok-9999 b/metadata/md5-cache/sci-libs/libsigrok-9999
index 10969924b1d9..46afa77115e2 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-9999
+++ b/metadata/md5-cache/sci-libs/libsigrok-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8 cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( dev-libs/libserialport ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pygobject-3.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( dev-libs/libserialport[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=609e67158ddaf567d86458819a99cae8
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.17-r1 b/metadata/md5-cache/sci-libs/libsvm-3.17-r1
index 2a856a74982c..0565a2a13c0a 100644
--- a/metadata/md5-cache/sci-libs/libsvm-3.17-r1
+++ b/metadata/md5-cache/sci-libs/libsvm-3.17-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=java? ( >=virtual/jre-1.4 ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.17.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2378122e1225273d61b37d1a7b26e4ce
diff --git a/metadata/md5-cache/sci-libs/mathgl-2.3.4 b/metadata/md5-cache/sci-libs/mathgl-2.3.4
new file mode 100644
index 000000000000..c003102d1f99
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mathgl-2.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
+DEPEND=!sci-visualization/udav virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2 ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg:0 ) lua? ( >=dev-lang/lua-5.1:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) python? ( dev-python/numpy[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-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(+)] ) qt4? ( dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) zlib? ( sys-libs/zlib ) doc? ( app-text/texi2html virtual/texi2dvi ) octave? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Math Graphics Library
+EAPI=5
+HOMEPAGE=http://mathgl.sourceforge.net/
+IUSE=doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf png python qt4 qt5 static-libs threads wxwidgets zlib linguas_ru python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=!sci-visualization/udav virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2 ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg:0 ) lua? ( >=dev-lang/lua-5.1:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) python? ( dev-python/numpy[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-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(+)] ) qt4? ( dev-qt/qtgui:4 ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=mpi? ( hdf5 ) openmp? ( !threads ) png? ( zlib ) pdf? ( png ) python? ( python_targets_python2_7 )
+SLOT=0/7.4.1
+SRC_URI=mirror://sourceforge/mathgl/mathgl-2.3.4.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_md5_=c2d86724b8dc025127a8c31b31793c38
diff --git a/metadata/md5-cache/sci-libs/naga-2.1 b/metadata/md5-cache/sci-libs/naga-2.1
index e457e64deb51..7e494ade8e40 100644
--- a/metadata/md5-cache/sci-libs/naga-2.1
+++ b/metadata/md5-cache/sci-libs/naga-2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://gentoo/naga-2.1.tar.bz2
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e716bd4c6a35ab10c1ce17534cf927d
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.7.1 b/metadata/md5-cache/sci-libs/opencascade-6.7.1
index 63641585521c..267ec03fed28 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.7.1
+++ b/metadata/md5-cache/sci-libs/opencascade-6.7.1
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk
 RESTRICT=bindist mirror
 SLOT=6.7.1
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.7.1_release/opencascade-6.7.1.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=771c693bbc44c53836820ee5d774b861
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.8.0 b/metadata/md5-cache/sci-libs/opencascade-6.8.0
index 2536b54c1d1a..46daef602268 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.8.0
+++ b/metadata/md5-cache/sci-libs/opencascade-6.8.0
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk
 RESTRICT=bindist mirror
 SLOT=6.8.0
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.8.0_release/opencascade-6.8.0.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29f68a2035276c2e5d1cdac2d84231c9
diff --git a/metadata/md5-cache/sci-libs/opencascade-6.9.0 b/metadata/md5-cache/sci-libs/opencascade-6.9.0
index ab085d1c7f2f..ce11a0105875 100644
--- a/metadata/md5-cache/sci-libs/opencascade-6.9.0
+++ b/metadata/md5-cache/sci-libs/opencascade-6.9.0
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk
 RESTRICT=bindist mirror
 SLOT=6.9.0
 SRC_URI=http://files.opencascade.com/OCCT/OCC_6.9.0_release/opencascade-6.9.0.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ad66d5fffdcdcb426d8dd99d846ee817
diff --git a/metadata/md5-cache/sci-libs/pastix-5.2.2.22 b/metadata/md5-cache/sci-libs/pastix-5.2.2.22
new file mode 100644
index 000000000000..b06420b28ecc
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.2.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/pkgconfig virtual/fortran
+DESCRIPTION=Parallel solver for very large sparse linear systems
+EAPI=6
+HOMEPAGE=http://pastix.gforge.inria.fr
+IUSE=doc int64 mpi starpu static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=CeCILL-C
+RDEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( virtual/mpi ) starpu? ( dev-libs/starpu:0= ) virtual/fortran
+SLOT=0
+SRC_URI=https://gforge.inria.fr/frs/download.php/35070/pastix_5.2.2.22.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=51d8cce797f1bd4adca31baf4b9b4fbf
diff --git a/metadata/md5-cache/sci-libs/plplot-5.10.0-r1 b/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
index f5c46f4412a2..dbe9681485de 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
+++ b/metadata/md5-cache/sci-libs/plplot-5.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ada? ( virtual/gnat:* ) cairo? ( x11-libs/cairo:0=[svg?,X?] ) gd? ( medi
 REQUIRED_USE=python? ( python_targets_python2_7 ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/plplot/plplot-5.10.0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=273cfb1ba113524dcc67fe480fc5bc5e
diff --git a/metadata/md5-cache/sci-libs/plplot-5.11.0-r1 b/metadata/md5-cache/sci-libs/plplot-5.11.0-r1
index 33a6b266ffdf..e79ca98660b4 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.11.0-r1
+++ b/metadata/md5-cache/sci-libs/plplot-5.11.0-r1
@@ -10,5 +10,5 @@ RDEPEND=ada? ( virtual/gnat:* ) cairo? ( x11-libs/cairo:0=[svg?,X?] ) gd? ( medi
 REQUIRED_USE=python? ( python_targets_python2_7 ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/plplot/plplot-5.11.0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=2891dd3c56baa9a6928f4980c0f706ea
diff --git a/metadata/md5-cache/sci-libs/plplot-5.11.1 b/metadata/md5-cache/sci-libs/plplot-5.11.1
index 52331ad0f9b8..6669939fa7f2 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.11.1
+++ b/metadata/md5-cache/sci-libs/plplot-5.11.1
@@ -10,5 +10,5 @@ RDEPEND=ada? ( virtual/gnat:* ) cairo? ( x11-libs/cairo:0=[svg?,X?] ) gd? ( medi
 REQUIRED_USE=python? ( python_targets_python2_7 ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/plplot/plplot-5.11.1.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=96338b4c93f95a985d4a24b6774058bb
diff --git a/metadata/md5-cache/sci-libs/plplot-5.11.1-r1 b/metadata/md5-cache/sci-libs/plplot-5.11.1-r1
index db5842ec1872..32cb3021e941 100644
--- a/metadata/md5-cache/sci-libs/plplot-5.11.1-r1
+++ b/metadata/md5-cache/sci-libs/plplot-5.11.1-r1
@@ -10,5 +10,5 @@ RDEPEND=ada? ( virtual/gnat:* ) cairo? ( x11-libs/cairo:0=[svg?,X?] ) gd? ( medi
 REQUIRED_USE=python? ( python_targets_python2_7 ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )
 SLOT=0/12
 SRC_URI=mirror://sourceforge/plplot/plplot-5.11.1.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	wxwidgets	cf6a488b00cd81e258206bc14b4167d9
 _md5_=55d18060477fcf8be63b45b734aedd27
diff --git a/metadata/md5-cache/sci-libs/proj-4.8.0 b/metadata/md5-cache/sci-libs/proj-4.8.0
index a963e9929566..32abb2322cab 100644
--- a/metadata/md5-cache/sci-libs/proj-4.8.0
+++ b/metadata/md5-cache/sci-libs/proj-4.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=ftp://ftp.remotesensing.org/pub/proj/proj-4.8.0.tar.gz http://download.osgeo.org/proj/proj-datumgrid-1.5.zip http://trac.osgeo.org/proj/export/2190/tags/4.8.0/proj/src/org_proj4_PJ.h -> proj-4.8.0-org_proj4_PJ.h
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f66df0aaf3854c7e1c1b6249350a2777
diff --git a/metadata/md5-cache/sci-libs/shogun-1.1.0 b/metadata/md5-cache/sci-libs/shogun-1.1.0
index 103605e62717..16cdcd31241d 100644
--- a/metadata/md5-cache/sci-libs/shogun-1.1.0
+++ b/metadata/md5-cache/sci-libs/shogun-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3 free-noncomm
 RDEPEND=sci-libs/gsl sys-libs/zlib arpack? ( sci-libs/arpack ) bzip2? ( app-arch/bzip2 ) glpk? ( sci-mathematics/glpk ) gzip? ( app-arch/gzip ) hdf5? ( sci-libs/hdf5 ) java? ( >=virtual/jdk-1.5 ) json? ( dev-libs/json-c ) lapack? ( virtual/cblas virtual/lapack ) lpsolve? ( sci-mathematics/lpsolve ) lua? ( dev-lang/lua ) lzo? ( dev-libs/lzo ) mono? ( dev-lang/mono ) octave? ( sci-mathematics/octave[hdf5=] ) python? ( dev-python/numpy ) R? ( dev-lang/R ) readline? ( sys-libs/readline ) ruby? ( >=dev-ruby/narray-0.6.0.1-r2 ) snappy? ( app-arch/snappy ) superlu? ( sci-libs/superlu ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=ftp://shogun-toolbox.org/shogun/releases/1.1/sources/shogun-1.1.0.tar.bz2 test? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.3.tar.bz2 ) examples? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.3.tar.bz2 )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fba2974b9e0c30eb539932692a0ae302
diff --git a/metadata/md5-cache/sci-libs/shogun-2.0.0 b/metadata/md5-cache/sci-libs/shogun-2.0.0
index 904f5416eb0c..c9970163af71 100644
--- a/metadata/md5-cache/sci-libs/shogun-2.0.0
+++ b/metadata/md5-cache/sci-libs/shogun-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3 free-noncomm
 RDEPEND=sci-libs/gsl sys-libs/zlib arpack? ( sci-libs/arpack ) bzip2? ( app-arch/bzip2 ) eigen? ( >=dev-cpp/eigen-3 ) glpk? ( sci-mathematics/glpk ) gzip? ( app-arch/gzip ) hdf5? ( sci-libs/hdf5 ) java? ( >=virtual/jdk-1.5 ) json? ( dev-libs/json-c ) lapack? ( virtual/cblas virtual/lapack ) lpsolve? ( sci-mathematics/lpsolve ) lua? ( dev-lang/lua ) lzo? ( dev-libs/lzo ) mono? ( dev-lang/mono ) nlopt? ( sci-libs/nlopt ) octave? ( sci-mathematics/octave[hdf5=] ) python? ( dev-python/numpy ) R? ( dev-lang/R ) readline? ( sys-libs/readline ) ruby? ( >=dev-ruby/narray-0.6.0.1-r2 ) snappy? ( app-arch/snappy ) superlu? ( sci-libs/superlu ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=ftp://shogun-toolbox.org/shogun/releases/2.0/sources/shogun-2.0.0.tar.bz2 test? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.4.tar.bz2 ) examples? ( ftp://shogun-toolbox.org/shogun/data/shogun-data-0.4.tar.bz2 )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e2479fd97344d67f6980f2a1b871821f
diff --git a/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14 b/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
index d398d94accab..0a9075ac4e4b 100644
--- a/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
+++ b/metadata/md5-cache/sci-libs/vecmath-objectclub-1.14
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.objectclub.jp/download/files/vecmath/vecmath1.2-1.14.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3fd9941a7b271c82a42358591dde782c
diff --git a/metadata/md5-cache/sci-libs/vtk-6.0.0 b/metadata/md5-cache/sci-libs/vtk-6.0.0
index b3a7cb7949df..6bd7af18d32e 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.0.0
+++ b/metadata/md5-cache/sci-libs/vtk-6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=java? ( qt4 ) python? ( python_targets_python2_7 ) tcl? ( rendering
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.0/vtk-6.0.0.tar.gz doc? ( http://www.vtk.org/files/release/6.0/vtkDocHtml-6.0.0.tar.gz )
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
 _md5_=9fbad09886dcaf20fbcb42d0b1e45375
diff --git a/metadata/md5-cache/sci-libs/vtk-6.1.0 b/metadata/md5-cache/sci-libs/vtk-6.1.0
index e12bb07ddcdb..40434447c856 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.1.0
+++ b/metadata/md5-cache/sci-libs/vtk-6.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 ) java? ( qt4 ) python? ( python_target
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.1/VTK-6.1.0.tar.gz doc? ( http://www.vtk.org/files/release/6.1/vtkDocHtml-6.1.0.tar.gz ) test? ( http://www.vtk.org/files/release/6.1/VTKData-6.1.0.tar.gz http://www.vtk.org/files/release/6.1/VTKLargeData-6.1.0.tar.gz )
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=f88574f9b8b9173403cd55b9eaf9f53b
diff --git a/metadata/md5-cache/sci-libs/vtk-6.1.0-r1 b/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
index ef7877b06bb8..034fd922c138 100644
--- a/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
+++ b/metadata/md5-cache/sci-libs/vtk-6.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 ) java? ( qt4 ) python? ( python_target
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.vtk.org/files/release/6.1/VTK-6.1.0.tar.gz doc? ( http://www.vtk.org/files/release/6.1/vtkDocHtml-6.1.0.tar.gz ) test? ( http://www.vtk.org/files/release/6.1/VTKData-6.1.0.tar.gz http://www.vtk.org/files/release/6.1/VTKLargeData-6.1.0.tar.gz )
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	webapp	42c6ef7af496b228f9854b3c81e4b226
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=2cb1e3b72264656bbac433fe1a38b700
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2011.1 b/metadata/md5-cache/sci-mathematics/isabelle-2011.1
index f41e37413fe2..2532c620356e 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2011.1
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2011.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=doc? ( virtual/latex-base dev-tex/rail ) proofgeneral? ( app-emacs/proofgeneral ) >=app-shells/bash-3.0 >=dev-lang/polyml-5.4.1[-portable] >=dev-lang/perl-5.8.8-r2 graphbrowsing? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2011-1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e3ef5700def383dccdd658c31bf03a79
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2 b/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
index 55328df6cba4..675a18fe829b 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2011.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml doc? ( virtual/latex-base dev-tex/rail ) proofgeneral? ( app-emacs/proofgeneral ) ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=app-shells/bash-3.0:* >=dev-lang/polyml-5.4.1:=[-portable] >=dev-lang/perl-5.8.8-r2 >=dev-java/java-config-2.2.0
 SLOT=0/2011.1
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2011-1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7f8b8958338eae91fec513ba76be160
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2012-r1 b/metadata/md5-cache/sci-mathematics/isabelle-2012-r1
index 09f3be58baae..0e86715be308 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2012-r1
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2012-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml doc? ( virtual/latex-base dev-tex/rail ) proofgeneral? ( app-emacs/proofgeneral ) pide? ( >=dev-lang/scala-2.8.2 ) ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=app-shells/bash-3.0:* >=dev-lang/polyml-5.4.1:=[-portable] >=dev-lang/perl-5.8.8-r2 >=dev-java/java-config-2.2.0
 SLOT=0/2012
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2012.tar.gz doc? ( https://dev.gentoo.org/~gienah/snapshots/Isabelle2012-doc-src.tar.gz ) pide? ( http://www4.in.tum.de/~wenzelm/test/jedit_build-20120414.tar.gz )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=414a76e960d933967c10f56f8c9a91e6
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2013-r2 b/metadata/md5-cache/sci-mathematics/isabelle-2013-r2
index 5d059c386702..5517b11dadc6 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2013-r2
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2013-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml >=virtual/jre-1.7 proofgeneral? ( >=app-emacs/proofgeneral-4.1 ) >=app-shells/bash-3.0:* dev-java/ant-core:0 >=dev-java/jcommon-1.0.18:1.0 >=dev-java/jfreechart-1.0.14:1.0 >=dev-java/itext-2.1.5:0 dev-java/xml-xmlbeans:1 >=dev-lang/ghc-7.6.3 >=dev-lang/polyml-5.5.0:=[-portable] >=dev-lang/perl-5.8.8-r2 dev-lang/swi-prolog virtual/jdk:1.7 doc? ( virtual/latex-base dev-tex/rail ) >=dev-lang/scala-2.10.2:2.10 ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=dev-java/java-config-2.2.0
 SLOT=0/2013
 SRC_URI=http://www.cl.cam.ac.uk/research/hvg/Isabelle/dist/Isabelle2013.tar.gz http://isabelle.in.tum.de/components/jedit_build-20130104.tar.gz -> jedit_build-isabelle-component-20130104.tar.gz http://isabelle.in.tum.de/components/jfreechart-1.0.14.tar.gz -> jfreechart-isabelle-component-1.0.14.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfe3307ee77b1945efebdb43e5069cd1
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1 b/metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
index abd3caf5fdda..920a94f287a9 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2013.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml >=virtual/jre-1.7 proofgeneral? ( >=app-emacs/proofgeneral-4.1 ) >=app-shells/bash-3.0:* dev-java/ant-core:0 >=dev-java/jcommon-1.0.18:1.0 >=dev-java/jfreechart-1.0.14:1.0 >=dev-java/itext-2.1.5:0 dev-java/xml-xmlbeans:1 dev-java/xz-java:0 >=dev-lang/ghc-7.6.3 >=dev-lang/polyml-5.5.1:=[-portable] >=dev-lang/perl-5.8.8-r2 dev-lang/swi-prolog virtual/jdk:1.7 doc? ( virtual/latex-base dev-tex/rail ) >=dev-lang/scala-2.11.1:2.11 ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=dev-java/java-config-2.2.0
 SLOT=0/2013.2
 SRC_URI=http://www.cl.cam.ac.uk/users/lcp/archive/Isabelle2013-2.tar.gz http://isabelle.in.tum.de/components/jedit_build-20131106.tar.gz -> jedit_build-isabelle-component-20131106.tar.gz http://isabelle.in.tum.de/dist/contrib/jfreechart-1.0.14-1.tar.gz -> jfreechart-isabelle-component-1.0.14-1.tar.gz https://dev.gentoo.org/~gienah/snapshots/polyml-isabelle-component-5.5.1-1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=28fc67fde56c4237b254116ca589f314
diff --git a/metadata/md5-cache/sci-mathematics/isabelle-2015 b/metadata/md5-cache/sci-mathematics/isabelle-2015
index c03a9dbeca9d..b36120bef150 100644
--- a/metadata/md5-cache/sci-mathematics/isabelle-2015
+++ b/metadata/md5-cache/sci-mathematics/isabelle-2015
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-perl/libwww-perl sci-mathematics/sha1-polyml >=virtual/jre-1.7 proofgeneral? ( >=app-emacs/proofgeneral-4.1 ) >=app-shells/bash-3.0:* >=dev-java/jcommon-1.0.18:1.0 >=dev-java/jfreechart-1.0.14:1.0 >=dev-java/itext-2.1.5:0 dev-java/xz-java:0 >=dev-lang/ghc-7.6.3 >=dev-lang/polyml-5.5.2:=[-portable] >=dev-lang/perl-5.8.8-r2 dev-lang/swi-prolog sci-libs/coinor-csdp =virtual/jdk-1.7* doc? ( virtual/latex-base dev-tex/rail ) >=dev-lang/scala-2.11.6:2.11 ledit? ( app-misc/ledit ) readline? ( app-misc/rlwrap ) >=dev-java/java-config-2.2.0
 SLOT=0/2015
 SRC_URI=http://isabelle.in.tum.de/dist/Isabelle2015.tar.gz http://dev.gentoo.org/~gienah/snapshots/csdp-isabelle-component-6.x.tar.gz http://dev.gentoo.org/~gienah/snapshots/exec_process-isabelle-component-1.0.3.tar.gz http://isabelle.in.tum.de/components/jedit_build-20150228.tar.gz -> jedit_build-isabelle-component-20150228.tar.gz http://isabelle.in.tum.de/dist/contrib/jfreechart-1.0.14-1.tar.gz -> jfreechart-isabelle-component-1.0.14-1.tar.gz http://dev.gentoo.org/~gienah/snapshots/polyml-isabelle-component-5.5.2-3.tar.gz http://dev.gentoo.org/~gienah/snapshots/xz-java-isabelle-component-1.5.tar.gz
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8585500046ab3d62ab01a952a719939a
diff --git a/metadata/md5-cache/sci-mathematics/kodkod-1.5.2 b/metadata/md5-cache/sci-mathematics/kodkod-1.5.2
index 999b419f8a4c..ff0a0cac2333 100644
--- a/metadata/md5-cache/sci-mathematics/kodkod-1.5.2
+++ b/metadata/md5-cache/sci-mathematics/kodkod-1.5.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0/1.5.2
 SRC_URI=http://alloy.mit.edu/kodkod/1.5.2/kodkod-1.5.2.zip https://waf.googlecode.com/files/waf-1.7.16
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	ad1dd5b59c523843eebd3a9934c509ca
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	ad1dd5b59c523843eebd3a9934c509ca
 _md5_=1079328c4cfb38e5b811c60b43f80cec
diff --git a/metadata/md5-cache/sci-mathematics/kodkodi-1.5.2 b/metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
index 1c3942baf63b..924826788483 100644
--- a/metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
+++ b/metadata/md5-cache/sci-mathematics/kodkodi-1.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-java/antlr:3 =sci-mathematics/kodkod-1.5*:= isabelle? ( >=sci-mathematics/isabelle-2011-r1:= ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0/1.5.2
 SRC_URI=http://www21.in.tum.de/~blanchet/kodkodi-1.5.2.tgz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb8947a599756fbaca9e135ba57907a4
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.1 b/metadata/md5-cache/sci-mathematics/octave-3.8.1
index a39601ff1d22..49766a07d897 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.8.1
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses jit? ( <sys-devel/llvm-3.5 ) virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] x11-libs/gl2ps virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline:0 ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) virtual/fortran java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/3.8.1
 SRC_URI=mirror://gnu/octave/octave-3.8.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9ddd4b4a1fa0dbee8bcc3332ebc3c78
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1 b/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
index c6859fd97eb2..28cf2088ffe9 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) jit? ( <sys-devel/llvm-3.5 ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/3.8.1
 SRC_URI=mirror://gnu/octave/octave-3.8.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=642ef8a040272197476de8933f1328a9
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.2 b/metadata/md5-cache/sci-mathematics/octave-3.8.2
index f353492545a4..f52fbd7e316b 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.8.2
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) jit? ( <sys-devel/llvm-3.5:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/3.8.2
 SRC_URI=mirror://gnu/octave/octave-3.8.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cbf2f702f80b15e4041b35b603455df
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.0.0 b/metadata/md5-cache/sci-mathematics/octave-4.0.0
index f93fad3152b0..037d543302ad 100644
--- a/metadata/md5-cache/sci-mathematics/octave-4.0.0
+++ b/metadata/md5-cache/sci-mathematics/octave-4.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/4.0.0
 SRC_URI=mirror://gnu/octave/octave-4.0.0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=676cfd3c63655cdfb09e040bc811585f
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.97.336 b/metadata/md5-cache/sci-mathematics/rstudio-0.97.336
index 6c8c1b7e0bda..c088b03b96e6 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.97.336
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.97.336
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.97.336.tar.gz -> rstudio-0.97.336.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.0.rc1.zip https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=59e56ccd68cc7556ebafbb4e5363a575
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.97.551 b/metadata/md5-cache/sci-mathematics/rstudio-0.97.551
index a14ee724952e..1674a91cb276 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.97.551
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.97.551
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.97.551.tar.gz -> rstudio-0.97.551.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.0.rc1.zip https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=59e56ccd68cc7556ebafbb4e5363a575
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.1028 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
index f915edce3620..41304b22276f 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.1028
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50 dev-libs/mathjax dev-libs/openssl:0 sys-apps/util-linux sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.1028.tar.gz -> rstudio-0.98.1028.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~hasufell/distfiles/packrat_0.3.0.tar.gz https://dev.gentoo.org/~hasufell/distfiles/rmarkdown_0.2.49.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=c1eac9b6f3e2c2b8b3810647ff3d2f62
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.1091 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.1091
index 2ea8cf9a6eb4..51639d3c05aa 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.1091
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.1091
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.1091.tar.gz -> rstudio-0.98.1091.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=f8679da66a9917534953c6ff7afff2b5
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.490 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.490
index 9d001ee9d66b..682a1bbe1b3e 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.490
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.490
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.490.tar.gz -> rstudio-0.98.490.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.1.zip https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=185cfce85788f3bf96d4d9942eefd326
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1
index 9f91af2d6af8..d54f503e6d98 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.490-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=>=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.490.tar.gz -> rstudio-0.98.490.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.1.zip https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=541b84156cde46ed352bb83613c3e0fa
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.932 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.932
index c169cf70a554..f1306d4c4e21 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.932
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.932
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.932.tar.gz -> rstudio-0.98.932.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~hasufell/distfiles/packrat_0.3.0.tar.gz https://dev.gentoo.org/~hasufell/distfiles/rmarkdown_0.2.49.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=712d7d9a161f476f69445615fc5aca51
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.98.953 b/metadata/md5-cache/sci-mathematics/rstudio-0.98.953
index ab26281085b6..38f9b239a8d2 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.98.953
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.98.953
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= dev-libs/mathjax dev-libs/openssl:0 sys-apps/util-linux sys-libs/zlib >=virtual/jre-1.5:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-4.8:4 >=dev-qt/qtdbus-4.8:4 >=dev-qt/qtgui-4.8:4 >=dev-qt/qtwebkit-4.8:4 >=dev-qt/qtxmlpatterns-4.8:4 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.98.953.tar.gz -> rstudio-0.98.953.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.6.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~hasufell/distfiles/packrat_0.3.0.tar.gz https://dev.gentoo.org/~hasufell/distfiles/rmarkdown_0.2.49.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=ce34402fa4d758765f7470007c787f79
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.99.473-r1 b/metadata/md5-cache/sci-mathematics/rstudio-0.99.473-r1
index 9b6aa02a0ccb..3310b2459a87 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.99.473-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.99.473-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.99.473.tar.gz -> rstudio-0.99.473.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1a275ce695545b8340271574c5daf5d8
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.99.482 b/metadata/md5-cache/sci-mathematics/rstudio-0.99.482
index ee70a88de340..22bb0acbf201 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.99.482
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.99.482
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.99.482.tar.gz -> rstudio-0.99.482.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1a275ce695545b8340271574c5daf5d8
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.99.483 b/metadata/md5-cache/sci-mathematics/rstudio-0.99.483
index 3da7c7c9ab6a..ca920488d4d9 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.99.483
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.99.483
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.99.483.tar.gz -> rstudio-0.99.483.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1a275ce695545b8340271574c5daf5d8
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.99.484 b/metadata/md5-cache/sci-mathematics/rstudio-0.99.484
index 606a1e393ba9..b8dc4210d998 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.99.484
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.99.484
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.99.484.tar.gz -> rstudio-0.99.484.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=1a275ce695545b8340271574c5daf5d8
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.99.486-r1 b/metadata/md5-cache/sci-mathematics/rstudio-0.99.486-r1
index 83d32be6a5c5..42b9b6ab00ef 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.99.486-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.99.486-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.99.486.tar.gz -> rstudio-0.99.486.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=26d7345de040bca5d3b15d946e072195
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.99.491 b/metadata/md5-cache/sci-mathematics/rstudio-0.99.491
index 388bce556015..89878c2353a3 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.99.491
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.99.491
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.99.491.tar.gz -> rstudio-0.99.491.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=26d7345de040bca5d3b15d946e072195
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-0.99.879 b/metadata/md5-cache/sci-mathematics/rstudio-0.99.879
index b03453acadc8..5092979a5268 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-0.99.879
+++ b/metadata/md5-cache/sci-mathematics/rstudio-0.99.879
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50:= >=dev-libs/mathjax-2.3 dev-libs/openssl:0 sys-apps/util-linux >=sys-devel/clang-3.5.0 sys-libs/zlib || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.4:5 >=dev-qt/qtdeclarative-5.4:5 >=dev-qt/qtdbus-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtopengl-5.4:5 >=dev-qt/qtpositioning-5.4:5 >=dev-qt/qtprintsupport-5.4:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] >=dev-qt/qtsensors-5.4:5 >=dev-qt/qtsql-5.4:5 >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtwebkit-5.4:5 >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( virtual/pam ) ) dedicated? ( virtual/pam ) >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v0.99.879.tar.gz -> rstudio-0.99.879.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-2.37.0.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-2.37.0.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip https://dev.gentoo.org/~gienah/distfiles/packrat-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rmarkdown-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/shinyapps-0.98.1000.tar.gz https://dev.gentoo.org/~gienah/distfiles/rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz
-_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=cmake-utils	c67ce9708a9c02be2d296cf547740e9c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=4cf858db5b03e93674b156552d98a10c
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.3.2 b/metadata/md5-cache/sci-mathematics/yacas-1.3.2
index 970cc2b78337..335c4d9a4c08 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.3.2
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://yacas.sourceforge.net/backups/yacas-1.3.2.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7a1fac8c72ea3b82a1c4a1163dddbd16
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.3.3 b/metadata/md5-cache/sci-mathematics/yacas-1.3.3
index 928d58fa80ba..15cad33539f9 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.3.3
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://yacas.sourceforge.net/backups/yacas-1.3.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=991d5a51aaff5662c0a0cc476d3efcb8
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.3.4 b/metadata/md5-cache/sci-mathematics/yacas-1.3.4
index 3fcaded5584d..6570454717c3 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.3.4
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/1
 SRC_URI=http://yacas.sourceforge.net/backups/yacas-1.3.4.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=108f9d492972bea20e31460b7162be75
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-3.0.2 b/metadata/md5-cache/sci-misc/netlogo-bin-3.0.2
index 35d4779958fa..d1a23cb4ec66 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-3.0.2
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-3.0.2
@@ -9,5 +9,5 @@ LICENSE=netlogo
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/netlogo.gif.tar http://ccl.northwestern.edu/netlogo/3.0.2/netlogo-3.0.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee17ac6ab5fad869ad3a19204e5d7b95
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4 b/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
index ab9e0f2a3256..1dc5f6ffa4b0 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-4.0.4
@@ -9,5 +9,5 @@ LICENSE=netlogo
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/netlogo.gif.tar http://ccl.northwestern.edu/netlogo/4.0.4/netlogo-4.0.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0529b604a88a57d7b7e0a53eed491841
diff --git a/metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1 b/metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
index 1c5b3103621e..894f34c849ca 100644
--- a/metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
+++ b/metadata/md5-cache/sci-misc/netlogo-bin-5.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=netlogo GPL-2 LGPL-2.1 LGPL-3 BSD Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/netlogo.gif.tar http://ccl.northwestern.edu/netlogo/5.0.3/netlogo-5.0.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f837bebb91fbc5d17df7b9179d4d3502
diff --git a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1 b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
index a2b34e5174aa..589f41f81f88 100644
--- a/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
+++ b/metadata/md5-cache/sci-physics/jaxodraw-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/jaxodraw/jaxodraw-2.0-1_src.tar.gz http://downloads.sourceforge.net/jaxodraw/axodraw4j_2008_11_19.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a32df77fb5497d6d42f2d0dd9f89240
diff --git a/metadata/md5-cache/sci-physics/thepeg-1.9.2 b/metadata/md5-cache/sci-physics/thepeg-1.9.2
index 060681752b89..2bf47a3b0e34 100644
--- a/metadata/md5-cache/sci-physics/thepeg-1.9.2
+++ b/metadata/md5-cache/sci-physics/thepeg-1.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:0= emacs? ( virtual/emacs ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5 ) lhapdf? ( sci-physics/lhapdf:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/18
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-1.9.2.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=414fe5134a161ab7c0091ea8f731c158
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.0.0 b/metadata/md5-cache/sci-physics/thepeg-2.0.0
index 58e0a0803b52..89a450569f3b 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.0.0
+++ b/metadata/md5-cache/sci-physics/thepeg-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:0= emacs? ( virtual/emacs ) fastjet? ( sci-physics/fastjet:0= ) hepmc? ( sci-physics/hepmc:0= ) java? ( >=virtual/jre-1.5 ) lhapdf? ( sci-physics/lhapdf:0= ) rivet? ( sci-physics/rivet:0= ) zlib? ( sys-libs/zlib:0= ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0/20
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-2.0.0.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c80bcaa61c47969c2f3f2c8e3034f41
diff --git a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1 b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
index e12c4ae88238..43447e66df4a 100644
--- a/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
+++ b/metadata/md5-cache/sci-visualization/gcalc-3.1_rc1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.4 !!sci-mathematics/gcalc >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://gcalc.net/files/GCalc-3.1-rc1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92cdfe8b0729868157ea9acff564b2c2
diff --git a/metadata/md5-cache/sys-apps/baobab-3.18.1 b/metadata/md5-cache/sys-apps/baobab-3.18.1
index 4fbfad1b4153..4ff3714666ed 100644
--- a/metadata/md5-cache/sys-apps/baobab-3.18.1
+++ b/metadata/md5-cache/sys-apps/baobab-3.18.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.13.2:3 dev-libs/libxml2 >=
 DESCRIPTION=Disk usage browser for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Baobab
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.13.2:3 gnome-base/gsettings-desktop-schemas x11-themes/gnome-icon-theme-extras !<gnome-extra/gnome-utils-3.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/baobab/3.18/baobab-3.18.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=22010e55d16ab016b96926af3d5fcf82
+_md5_=9568f23f89626761c3a2f8167da3b83e
diff --git a/metadata/md5-cache/sys-apps/fbset-2.1 b/metadata/md5-cache/sys-apps/fbset-2.1
index facc6daae943..923241aac939 100644
--- a/metadata/md5-cache/sys-apps/fbset-2.1
+++ b/metadata/md5-cache/sys-apps/fbset-2.1
@@ -4,9 +4,9 @@ DESCRIPTION=A utility to set the framebuffer videomode
 EAPI=0
 HOMEPAGE=http://users.telenet.be/geertu/Linux/fbdev/
 IUSE=static
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://users.telenet.be/geertu/Linux/fbdev/fbset-2.1.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a9d2b5b5b0a85a2d37f80500509b81a0
+_md5_=73a99a8fe48e4abf1fd9baddf5a14cc0
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.18.3.1 b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.18.3.1
index 31cf5a73f672..454fa13f838c 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-3.18.3.1
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-3.18.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Disk Utility for GNOME using udisks
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-disk-utility
 IUSE=fat gnome systemd
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2[dbus] >=sys-fs/udisks-2.1.1:2 >=x11-libs/gtk+-3.16.0:3 >=app-arch/xz-utils-5.0.5 >=app-crypt/libsecret-0.7 dev-libs/libpwquality systemd? ( >=sys-apps/systemd-209:0= ) >=media-libs/libdvdread-4.2.0 >=media-libs/libcanberra-0.1[gtk3] >=x11-libs/libnotify-0.7:= >=x11-themes/gnome-icon-theme-symbolic-2.91 fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/3.18/gnome-disk-utility-3.18.3.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ddbd7ec7ce7347ab909c597aa3de56d9
+_md5_=e58a80d0de8c610bae3dfb77131ec3c2
diff --git a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r1 b/metadata/md5-cache/sys-apps/xinetd-2.3.15-r1
deleted file mode 100644
index 38d7ba1ba854..000000000000
--- a/metadata/md5-cache/sys-apps/xinetd-2.3.15-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=powerful replacement for inetd
-EAPI=5
-HOMEPAGE=http://www.xinetd.org/
-IUSE=perl rpc tcpd
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD
-RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) rpc? ( net-libs/libtirpc:= ) perl? ( dev-lang/perl )
-SLOT=0
-SRC_URI=http://www.xinetd.org/xinetd-2.3.15.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=26fd73407e52b74c04f00d208be46e10
diff --git a/metadata/md5-cache/sys-block/di-4.40 b/metadata/md5-cache/sys-block/di-4.40
deleted file mode 100644
index 40ecccb6ff9e..000000000000
--- a/metadata/md5-cache/sys-block/di-4.40
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Disk Information Utility
-EAPI=5
-HOMEPAGE=http://www.gentoo.com/di/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=ZLIB
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.gentoo.com/di/di-4.40.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c455b517b38cecf34ceb4f260cce324d
diff --git a/metadata/md5-cache/sys-block/di-4.38 b/metadata/md5-cache/sys-block/di-4.42
similarity index 88%
rename from metadata/md5-cache/sys-block/di-4.38
rename to metadata/md5-cache/sys-block/di-4.42
index 0580ac3e75a7..bdb315b49075 100644
--- a/metadata/md5-cache/sys-block/di-4.38
+++ b/metadata/md5-cache/sys-block/di-4.42
@@ -6,6 +6,6 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=ZLIB
 RESTRICT=test
 SLOT=0
-SRC_URI=http://www.gentoo.com/di/di-4.38.tar.gz
+SRC_URI=http://www.gentoo.com/di/di-4.42.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
 _md5_=c455b517b38cecf34ceb4f260cce324d
diff --git a/metadata/md5-cache/sys-block/gparted-0.25.0 b/metadata/md5-cache/sys-block/gparted-0.25.0
index 906efca50972..0204bdc6d7dc 100644
--- a/metadata/md5-cache/sys-block/gparted-0.25.0
+++ b/metadata/md5-cache/sys-block/gparted-0.25.0
@@ -4,10 +4,10 @@ DESCRIPTION=Gnome Partition Editor
 EAPI=5
 HOMEPAGE=http://gparted.sourceforge.net/
 IUSE=btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=>=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.22:2.4 >=dev-libs/glib-2:2 >=sys-block/parted-3.2:= !policykit? ( kde? ( kde-apps/kdesu ) ) policykit? ( sys-auth/polkit ) >=sys-apps/util-linux-2.20 >=sys-fs/e2fsprogs-1.41 btrfs? ( sys-fs/btrfs-progs ) dmraid? ( >=sys-fs/lvm2-2.02.45 sys-fs/dmraid sys-fs/multipath-tools ) f2fs? ( sys-fs/f2fs-tools ) fat? ( sys-fs/dosfstools sys-fs/mtools ) hfs? ( sys-fs/diskdev_cmds virtual/udev sys-fs/hfsutils ) jfs? ( sys-fs/jfsutils ) mdadm? ( sys-fs/mdadm ) ntfs? ( >=sys-fs/ntfs3g-2011.4.12[ntfsprogs] ) reiserfs? ( sys-fs/reiserfsprogs ) reiser4? ( sys-fs/reiser4progs ) xfs? ( sys-fs/xfsprogs sys-fs/xfsdump )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-0.25.0.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3496419d8ac285efb9136d16324c56f9
+_md5_=03f60a3e0774bdea6ef603b4ea6bf16d
diff --git a/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1 b/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
index 8a1659a963a8..d9cd41888102 100644
--- a/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
+++ b/metadata/md5-cache/sys-cluster/charmdebug-6.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=charm
 RDEPEND=>=virtual/jre-1.6 sys-cluster/charm[charmdebug,-smp] >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://charm.cs.illinois.edu/distrib/binaries/charmdebug/charmdebug_6.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82cd77317d564b4c87cbbb0bb6318270
diff --git a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2 b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
index df454d0d5392..2eac88214f0a 100644
--- a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
+++ b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
@@ -9,5 +9,5 @@ LICENSE=mpich2
 RDEPEND=!minimal? ( >=virtual/jre-1.6 ) !minimal? ( x11-libs/libXtst x11-libs/libXi ) || ( sys-cluster/openmpi[fortran?,threads?] sys-cluster/mpich2[fortran?,threads?] ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=ftp://ftp.mcs.anl.gov/pub/mpi/mpe/mpe2-1.0.6p1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfbeaadb07e675a1e142d76476702ba3
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.10.0 b/metadata/md5-cache/sys-cluster/openmpi-1.10.0
index 5bad57a7c25f..9cd181b8d233 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.10.0
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/lib
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.0.tar.bz2
-_eclasses_=cuda	0ecb926cd855df14e36328a247443e49	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cuda	0ecb926cd855df14e36328a247443e49	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f71aa84fe78c49cbce79a706e05f407
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.10.2 b/metadata/md5-cache/sys-cluster/openmpi-1.10.2
index 5baca4bcc3ad..bc95b5c9539f 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.10.2
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.10.2
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/lib
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.10/downloads/openmpi-1.10.2.tar.bz2
-_eclasses_=cuda	0ecb926cd855df14e36328a247443e49	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cuda	0ecb926cd855df14e36328a247443e49	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0eec024d3c5b25ef247a2fa3a5b5c8c1
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1 b/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
index 42314395da9c..9d3b291c6bdc 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.7-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/lib
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.7.tar.bz2
-_eclasses_=cuda	0ecb926cd855df14e36328a247443e49	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cuda	0ecb926cd855df14e36328a247443e49	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23ef4e4ec222e4ffa74973712296038c
diff --git a/metadata/md5-cache/sys-cluster/openmpi-1.8.8 b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
index 27d78e9a804a..4f04251f26b1 100644
--- a/metadata/md5-cache/sys-cluster/openmpi-1.8.8
+++ b/metadata/md5-cache/sys-cluster/openmpi-1.8.8
@@ -10,5 +10,5 @@ RDEPEND=!sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec dev-libs/lib
 REQUIRED_USE=openmpi_rm_slurm? ( !openmpi_rm_pbs ) openmpi_rm_pbs? ( !openmpi_rm_slurm ) openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed ) openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed ) openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )
 SLOT=0
 SRC_URI=http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.bz2
-_eclasses_=cuda	0ecb926cd855df14e36328a247443e49	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cuda	0ecb926cd855df14e36328a247443e49	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9acc9ef8ee6b188fb884b43ee5620e76
diff --git a/metadata/md5-cache/sys-cluster/projections-6.2.1 b/metadata/md5-cache/sys-cluster/projections-6.2.1
index c31f4dc26fed..46232554a486 100644
--- a/metadata/md5-cache/sys-cluster/projections-6.2.1
+++ b/metadata/md5-cache/sys-cluster/projections-6.2.1
@@ -9,5 +9,5 @@ LICENSE=charm
 RDEPEND=>=virtual/jre-1.6 sys-cluster/charm[charmtracing] >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://charm.cs.illinois.edu/distrib/binaries/projections/projections_6.2.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=667967b0c3738f5da16ece4fd95f7bfb
diff --git a/metadata/md5-cache/sys-devel/autogen-5.18.4 b/metadata/md5-cache/sys-devel/autogen-5.18.4
index a1bb512a7359..8420ee28b72e 100644
--- a/metadata/md5-cache/sys-devel/autogen-5.18.4
+++ b/metadata/md5-cache/sys-devel/autogen-5.18.4
@@ -4,10 +4,10 @@ DESCRIPTION=Program and text file generation
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/autogen/
 IUSE=libopts static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-1.8 dev-libs/libxml2
 SLOT=0
 SRC_URI=mirror://gnu/autogen/rel5.18.4/autogen-5.18.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a5bfb05b5bb2848ece3fea9c26e4837a
+_md5_=37fa7171df5b76d723326ae464d82353
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.4 b/metadata/md5-cache/sys-devel/gettext-0.19.4
index e5f972f5b6fb..72cdaf20669c 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.4
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.4
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[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/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e7d216d38f3664ab5cd86880ac8c005
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.6-r1 b/metadata/md5-cache/sys-devel/gettext-0.19.6-r1
index 3468dd1ed477..ffe97d5986a0 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.6-r1
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.6-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[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/libintl-0-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(-)?] dev-libs/libxml2:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.6.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5711970f10485ada024f9a1758578dfc
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.7 b/metadata/md5-cache/sys-devel/gettext-0.19.7
index 88fd640f5265..436a4715d103 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.7
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.7
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[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/libintl-0-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(-)?] dev-libs/libxml2:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.7.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	mono-env	10809200679bcceefebac9e72bebb6e6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5711970f10485ada024f9a1758578dfc
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20160223 b/metadata/md5-cache/sys-fs/aufs3-3_p20160223
new file mode 100644
index 000000000000..77269dcd945c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20160223
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=An entirely re-designed and re-implemented Unionfs
+EAPI=6
+HOMEPAGE=http://aufs.sourceforge.net/
+IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs4 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-3_p20160223.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e2119575c50a915606fa14a61856acf6
diff --git a/metadata/md5-cache/sys-fs/aufs4-0_pre20160223 b/metadata/md5-cache/sys-fs/aufs4-0_pre20160223
new file mode 100644
index 000000000000..ca0ab3f3194c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/aufs4-0_pre20160223
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=An entirely re-designed and re-implemented Unionfs
+EAPI=6
+HOMEPAGE=http://aufs.sourceforge.net/
+IUSE=debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/aufs-util !sys-fs/aufs !sys-fs/aufs2 !sys-fs/aufs3 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-0_pre20160223.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=961e0579d11cd876090ac561cdfba5cd
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
index 0285d5f2d2e1..648104af1a37 100644
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
+++ b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_2_5.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=753453c4737d6ca6390fc09f47d57b86
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
index 47445b3bcb6a..925ec5acd4d9 100644
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
+++ b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_3_0.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=753453c4737d6ca6390fc09f47d57b86
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
index 0e231be16f22..2da338b9e5af 100644
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
+++ b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.4.1
@@ -9,5 +9,5 @@ LICENSE=freedist
 RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2245da2e9011ecdc4ae409c45a11a81
diff --git a/metadata/md5-cache/sys-fs/lxcfs-0.13 b/metadata/md5-cache/sys-fs/lxcfs-2.0.0_beta2
similarity index 52%
rename from metadata/md5-cache/sys-fs/lxcfs-0.13
rename to metadata/md5-cache/sys-fs/lxcfs-2.0.0_beta2
index f6d77f0a748e..041325273c50 100644
--- a/metadata/md5-cache/sys-fs/lxcfs-0.13
+++ b/metadata/md5-cache/sys-fs/lxcfs-2.0.0_beta2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=sys-apps/help2man dev-libs/glib:2 sys-fs/fuse virtual/pkgconfig
+DEPEND=sys-apps/help2man dev-libs/glib:2 sys-fs/fuse virtual/pam virtual/pkgconfig
 DESCRIPTION=FUSE filesystem for LXC
 EAPI=5
 HOMEPAGE=https://linuxcontainers.org/lxcfs/introduction/
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/glib:2 sys-fs/fuse
+RDEPEND=dev-libs/glib:2 sys-fs/fuse virtual/pam
 SLOT=0
-SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-0.13.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
-_md5_=250eb140ad2cc02879fb4ff784454352
+SRC_URI=https://github.com/lxc/lxcfs/archive/lxcfs-2.0.0.beta2.tar.gz -> lxcfs-2.0.0_beta2.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8ff337b77519a3566cb3e502449cce28
diff --git a/metadata/md5-cache/sys-fs/quota-4.03 b/metadata/md5-cache/sys-fs/quota-4.03
index 27895d2f6a11..8785df51bb22 100644
--- a/metadata/md5-cache/sys-fs/quota-4.03
+++ b/metadata/md5-cache/sys-fs/quota-4.03
@@ -10,4 +10,4 @@ RDEPEND=ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus dev-libs/li
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxquota/quota-4.03.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=39427bd2f241b577ac8f52f142e84650
+_md5_=1b21ffc3626c7a28f06a3c81666634df
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.3.6 b/metadata/md5-cache/sys-kernel/aufs-sources-4.3.6
new file mode 100644
index 000000000000..2da53817262c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.3.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.3 kernel tree and aufs4 support
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=deblob experimental module vanilla symlink build kdbus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.3.6
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.3_p20160223.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.3-8.base.tar.xz mirror://gentoo/genpatches-4.3-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.3-8.experimental.tar.xz ) )
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1b3bddc3c33d33970937e6955640610c
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.82 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.82
deleted file mode 100644
index 2f35ff3fd0fc..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.82
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.10 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.82
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-88.base.tar.xz mirror://gentoo/genpatches-3.10-88.extras.tar.xz mirror://gentoo/genpatches-3.10-88.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=cc501d95138e664f1487baa586c9acf6
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.86 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.86
deleted file mode 100644
index d338ed7ccbf5..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.86
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.10 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.86
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-91.base.tar.xz mirror://gentoo/genpatches-3.10-91.extras.tar.xz mirror://gentoo/genpatches-3.10-91.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=692be0854140d81e4726d59b4e694e78
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.87 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.87
deleted file mode 100644
index c1855a375285..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.87
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.10 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.10.87
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-92.base.tar.xz mirror://gentoo/genpatches-3.10-92.extras.tar.xz mirror://gentoo/genpatches-3.10-92.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3233960ea3d0679c42af4f9733db6de2
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.83 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.97
similarity index 57%
rename from metadata/md5-cache/sys-kernel/ck-sources-3.10.83
rename to metadata/md5-cache/sys-kernel/ck-sources-3.10.97
index 8912ee2cb346..37b3e5cc32f4 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.83
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.10.97
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.10 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 3.10
 EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=bfsonly symlink build deblob
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.10.83
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-89.base.tar.xz mirror://gentoo/genpatches-3.10-89.extras.tar.xz mirror://gentoo/genpatches-3.10-89.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
+SLOT=3.10.97
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-102.base.tar.xz mirror://gentoo/genpatches-3.10-102.extras.tar.xz mirror://gentoo/genpatches-3.10-102.experimental.tar.xz !bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( https://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b8a11cd9e2b360755ba2c8f305c64cb6
+_md5_=a42284dd12a6c25eabaef661089fe72f
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.48 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.48
deleted file mode 100644
index 4f9194529073..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.48
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.14 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.48
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-54.base.tar.xz mirror://gentoo/genpatches-3.14-54.extras.tar.xz mirror://gentoo/genpatches-3.14-54.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6795b0b1610557e86007b48f96ff6d25
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.50 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.50
deleted file mode 100644
index d573a0e7d425..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.50
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.14 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.50
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-56.base.tar.xz mirror://gentoo/genpatches-3.14-56.extras.tar.xz mirror://gentoo/genpatches-3.14-56.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=26953e2e3fd68a2bc0b32c70ff95fcbc
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.51 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.51
deleted file mode 100644
index ddc934732aa2..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.51
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.14 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.14.51
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-57.base.tar.xz mirror://gentoo/genpatches-3.14-57.extras.tar.xz mirror://gentoo/genpatches-3.14-57.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2c3e2eee8a2cf5cc7df9e5876e226589
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.46 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.61
similarity index 70%
rename from metadata/md5-cache/sys-kernel/ck-sources-3.14.46
rename to metadata/md5-cache/sys-kernel/ck-sources-3.14.61
index 4a68b6d47226..6ae3a137276a 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.46
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.14.61
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.14 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 3.14
 EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=bfsonly symlink build deblob
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.46
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-52.base.tar.xz mirror://gentoo/genpatches-3.14-52.extras.tar.xz mirror://gentoo/genpatches-3.14-52.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
+SLOT=3.14.61
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-68.base.tar.xz mirror://gentoo/genpatches-3.14-68.extras.tar.xz mirror://gentoo/genpatches-3.14-68.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=005b4ae66ded32d0fcccd0368ed5086b
+_md5_=9712684361f84eeceadccf1421bfa9a5
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.18.16 b/metadata/md5-cache/sys-kernel/ck-sources-3.18.16
deleted file mode 100644
index fce9f2b85d67..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.18.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.18 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.18.16
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/v3.x/incr/patch-3.18.14-15.xz mirror://kernel/linux/kernel/v3.x/incr/patch-3.18.15-16.xz mirror://gentoo/genpatches-3.18-16.base.tar.xz mirror://gentoo/genpatches-3.18-16.extras.tar.xz mirror://gentoo/genpatches-3.18-16.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patch-3.18-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patches/3.18-sched-bfs-460.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2c3c9106f227c549472a7154e25e8237
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.18.19 b/metadata/md5-cache/sys-kernel/ck-sources-3.18.27
similarity index 70%
rename from metadata/md5-cache/sys-kernel/ck-sources-3.18.19
rename to metadata/md5-cache/sys-kernel/ck-sources-3.18.27
index ecf1401b38a7..5c425f3ac820 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.18.19
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.18.27
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.18 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 3.18
 EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=bfsonly symlink build deblob
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.18.19
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-19.base.tar.xz mirror://gentoo/genpatches-3.18-19.extras.tar.xz mirror://gentoo/genpatches-3.18-19.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patch-3.18-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patches/3.18-sched-bfs-460.patch )
+SLOT=3.18.27
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-28.base.tar.xz mirror://gentoo/genpatches-3.18-28.extras.tar.xz mirror://gentoo/genpatches-3.18-28.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patch-3.18-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patches/3.18-sched-bfs-460.patch )
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=199b2ea28aa3bb9a6d1cc3d73ae77856
+_md5_=11e9b5311d34ed1386915d16dbc3c1a5
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.19.8 b/metadata/md5-cache/sys-kernel/ck-sources-3.19.8
deleted file mode 100644
index 56b4103f7a4b..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.19.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.19 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=3.19.8
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.19-gnu/deblob-3.19 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.19-gnu/deblob-check -> deblob-check-3.19 ) mirror://gentoo/genpatches-3.19-9.base.tar.xz mirror://gentoo/genpatches-3.19-9.extras.tar.xz mirror://gentoo/genpatches-3.19-9.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.19/3.19-ck1/patch-3.19-ck1.xz ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.19/3.19-ck1/patches/3.19-sched-bfs-461.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f566464d18e10e239865b5aff578fd8d
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.4.107 b/metadata/md5-cache/sys-kernel/ck-sources-3.4.110
similarity index 76%
rename from metadata/md5-cache/sys-kernel/ck-sources-3.4.107
rename to metadata/md5-cache/sys-kernel/ck-sources-3.4.110
index 176ed88986d4..fa82e0600248 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.4.107
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.4.110
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 3.4 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 3.4
 EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=bfsonly experimental urwlocks symlink build deblob
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.4.107
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu/deblob-3.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-90.base.tar.xz mirror://gentoo/genpatches-3.4-90.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patch-3.4-ck3.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/3.4-sched-bfs-424.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/bfs424-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/urw-locks.patch ) )
+SLOT=3.4.110
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu/deblob-3.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-93.base.tar.xz mirror://gentoo/genpatches-3.4-93.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patch-3.4-ck3.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/3.4-sched-bfs-424.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/bfs424-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/urw-locks.patch ) )
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ade4edb99d2aca217b91af1b220dbdb
+_md5_=67373d078924fd8eeeefddeb8202e058
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.0.7 b/metadata/md5-cache/sys-kernel/ck-sources-4.0.7
deleted file mode 100644
index 01424a6220b9..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.0 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.0.7
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-9.base.tar.xz mirror://gentoo/genpatches-4.0-9.extras.tar.xz mirror://gentoo/genpatches-4.0-9.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patch-4.0-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patches/4.0-sched-bfs-462.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=218d6150d858a6cb224303047c25867a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.0.9 b/metadata/md5-cache/sys-kernel/ck-sources-4.0.9
deleted file mode 100644
index e4175e6e4cfb..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.0 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.0.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-11.base.tar.xz mirror://gentoo/genpatches-4.0-11.extras.tar.xz mirror://gentoo/genpatches-4.0-11.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patch-4.0-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patches/4.0-sched-bfs-462.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=962e2e2dc9fe41d16ae5a59968618f3e
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.1.6 b/metadata/md5-cache/sys-kernel/ck-sources-4.1.18
similarity index 68%
rename from metadata/md5-cache/sys-kernel/ck-sources-4.1.6
rename to metadata/md5-cache/sys-kernel/ck-sources-4.1.18
index 4b79055d100f..a0ed4aca443e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.1.6
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.1.18
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.1 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.1
 EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=symlink build deblob
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.1.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-10.base.tar.xz mirror://gentoo/genpatches-4.1-10.extras.tar.xz mirror://gentoo/genpatches-4.1-10.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.1/4.1-ck2/patch-4.1-ck2.bz2
+SLOT=4.1.18
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-23.base.tar.xz mirror://gentoo/genpatches-4.1-23.extras.tar.xz mirror://gentoo/genpatches-4.1-23.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.1/4.1-ck2/patch-4.1-ck2.bz2
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=535b6b60567cbb72e6018b391b02a97a
+_md5_=18b83be502550323fc52683cc4d5fd38
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.1.3 b/metadata/md5-cache/sys-kernel/ck-sources-4.1.3
deleted file mode 100644
index 1e46a530249c..000000000000
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.1 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
-EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
-IUSE=bfsonly symlink build deblob
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 !deblob? ( freedist )
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.1.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-7.base.tar.xz mirror://gentoo/genpatches-4.1-7.extras.tar.xz mirror://gentoo/genpatches-4.1-7.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.1/4.1-ck1/patch-4.1-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.1/4.1-ck1/patches/4.1-sched-bfs-463.patch )
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=086507673a028d30351edb5a73116ab7
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.1.5 b/metadata/md5-cache/sys-kernel/ck-sources-4.3.6
similarity index 54%
rename from metadata/md5-cache/sys-kernel/ck-sources-4.1.5
rename to metadata/md5-cache/sys-kernel/ck-sources-4.3.6
index 4ddf557b17f8..5cefffa21926 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.1.5
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.3.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Full Linux 4.1 kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.3
 EAPI=5
-HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.on.net/~ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
 IUSE=symlink build deblob
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.1.5
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-9.base.tar.xz mirror://gentoo/genpatches-4.1-9.extras.tar.xz mirror://gentoo/genpatches-4.1-9.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.1/4.1-ck2/patch-4.1-ck2.bz2
+SLOT=4.3.6
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.3-gnu/deblob-4.3 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.3-gnu/deblob-check -> deblob-check-4.3 ) mirror://gentoo/genpatches-4.3-8.base.tar.xz mirror://gentoo/genpatches-4.3-8.extras.tar.xz mirror://gentoo/genpatches-4.3-8.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.3/4.3-ck3/patch-4.3-ck3.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a31a8deb086e78027f93277da146e687
+_md5_=e0eef4439d68dee095271048509cd646
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.5_rc5 b/metadata/md5-cache/sys-kernel/git-sources-4.5_rc5
new file mode 100644
index 000000000000..f25255d50da5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.5_rc5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=>=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.5_rc5
+SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.5-rc5.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2530496649f2dd0a24b85f6bfed406bc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.96 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.97
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.10.96
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.10.97
index d69abb6ca5c6..f8a9896ced4b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.96
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.97
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.10.96
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.96.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
+SLOT=3.10.97
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.97.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0dc8fcb8286cc84f96e1568a488616d6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.60 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.61
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-3.14.60
rename to metadata/md5-cache/sys-kernel/vanilla-sources-3.14.61
index 1ee9e1672a39..2f261b76796c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.60
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.61
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.60
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.60.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz
+SLOT=3.14.61
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.61.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0dc8fcb8286cc84f96e1568a488616d6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.3.5 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.3.6
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.3.5
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.3.6
index 73e6d748a9a6..582bb5c4e7be 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.3.5
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.3.6
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.3.5
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.3.5.xz mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz
+SLOT=4.3.6
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.3.6.xz mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0dc8fcb8286cc84f96e1568a488616d6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.1 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.2
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.1
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.2
index 4f2a7ca45ae9..4260dc2693a6 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.1
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.2
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.1
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.1.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.2
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.2.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	kernel-2	f745fe70cd0e35af07412905687b9a7f	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0dc8fcb8286cc84f96e1568a488616d6
diff --git a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1 b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
index c1f9c6f7b782..7e3b5e7d7513 100644
--- a/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
+++ b/metadata/md5-cache/sys-libs/db-4.2.52_p5-r1
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.2
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.2.52.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.4 http://www.oracle.com/technology/products/berkeley-db/db/update/4.2.52/patch.4.2.52.5
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b463a66ce3d0b8f0cf8abab584a93306
diff --git a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1 b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
index f218b101ef19..cb5e8ff1d641 100644
--- a/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
+++ b/metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.3.29.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.3.29/patch.4.3.29.1
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=033613b655eabc1078cdd5dbd22d03aa
diff --git a/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1 b/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
index 67b52741254a..da9b5ba940ea 100644
--- a/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
+++ b/metadata/md5-cache/sys-libs/db-4.4.20_p4-r1
@@ -9,5 +9,5 @@ LICENSE=Sleepycat BSD
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.4
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.4.20.tar.gz mirror://gentoo/db-4.4.20-20060110-rpc_server-java.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/patch.4.4.20.4
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2d97240a349550a818c26fa9b4144262
diff --git a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1 b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
index 6d13422c8e95..8d074904ca8c 100644
--- a/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
+++ b/metadata/md5-cache/sys-libs/db-4.5.20_p2-r1
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.5
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.5.20/patch.4.5.20.2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8f70a29020953cf8ac350dbf00da343c
diff --git a/metadata/md5-cache/sys-libs/db-4.6.21_p4 b/metadata/md5-cache/sys-libs/db-4.6.21_p4
index feff3f055f2a..7013117288eb 100644
--- a/metadata/md5-cache/sys-libs/db-4.6.21_p4
+++ b/metadata/md5-cache/sys-libs/db-4.6.21_p4
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.6
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.6.21.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.6.21/patch.4.6.21.4
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3900d5f8cbcc319ceaa2ba5824313896
diff --git a/metadata/md5-cache/sys-libs/db-4.7.25_p4 b/metadata/md5-cache/sys-libs/db-4.7.25_p4
index 967fb41950ce..c295638cce7f 100644
--- a/metadata/md5-cache/sys-libs/db-4.7.25_p4
+++ b/metadata/md5-cache/sys-libs/db-4.7.25_p4
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.7
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.1 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.2 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.3 http://www.oracle.com/technology/products/berkeley-db/db/update/4.7.25/patch.4.7.25.4
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=409a4b0ca8da64e5c3d598a6ace80dcf
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30-r1 b/metadata/md5-cache/sys-libs/db-4.8.30-r1
index 28704a8e2a70..d671d1738883 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30-r1
+++ b/metadata/md5-cache/sys-libs/db-4.8.30-r1
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1: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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02fb4f0c125741c9ab5eaddd9a111b1a
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30-r2 b/metadata/md5-cache/sys-libs/db-4.8.30-r2
index 20ae84067d86..a05ae2fa9740 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30-r2
+++ b/metadata/md5-cache/sys-libs/db-4.8.30-r2
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=311ed2ba88aa6ee9f40a82bb579c4fd4
diff --git a/metadata/md5-cache/sys-libs/db-5.1.29-r1 b/metadata/md5-cache/sys-libs/db-5.1.29-r1
index 69e5c5c92a05..8198485c213d 100644
--- a/metadata/md5-cache/sys-libs/db-5.1.29-r1
+++ b/metadata/md5-cache/sys-libs/db-5.1.29-r1
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( dev-lang/tcl:0 ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/j
 REQUIRED_USE=test? ( tcl )
 SLOT=5.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.1.29.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc739718b1de2aa03906705c3700164c
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r2 b/metadata/md5-cache/sys-libs/db-5.3.28-r2
index be1a876fda31..b29ba55fadb9 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r2
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r2
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d0738dd423ab264cec93531ad66a91a
diff --git a/metadata/md5-cache/sys-libs/db-6.0.30-r1 b/metadata/md5-cache/sys-libs/db-6.0.30-r1
index f9ad42422c1f..229e83031f8c 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.30-r1
+++ b/metadata/md5-cache/sys-libs/db-6.0.30-r1
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.30.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5589db043c621301b7a20326e483bbfe
diff --git a/metadata/md5-cache/sys-libs/db-6.0.35 b/metadata/md5-cache/sys-libs/db-6.0.35
index a6e6896aadbd..80161607d336 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.35
+++ b/metadata/md5-cache/sys-libs/db-6.0.35
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.35.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27d77932ccf1eb3a206cc1e27c0340d8
diff --git a/metadata/md5-cache/sys-libs/db-6.1.26 b/metadata/md5-cache/sys-libs/db-6.1.26
index 45e46af232b2..99d5a6756f9d 100644
--- a/metadata/md5-cache/sys-libs/db-6.1.26
+++ b/metadata/md5-cache/sys-libs/db-6.1.26
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=6.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.26.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	db	806b626ad04d8a628c9e2c9d9458ddcb	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=83c14596400b554a7b8b5586e7ef45b9
diff --git a/metadata/md5-cache/sys-libs/libosinfo-0.3.0 b/metadata/md5-cache/sys-libs/libosinfo-0.3.0
index 6c234b9d9a55..083f8b6f7bf6 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-0.3.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-0.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=5
 HOMEPAGE=http://libosinfo.org/
 IUSE=+introspection +vala test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libxslt-1.0.0:= dev-libs/libxml2:= >=net-libs/libsoup-2.42:2.4 sys-apps/hwids introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://fedorahosted.org/releases/l/i/libosinfo/libosinfo-0.3.0.tar.gz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	73058269b3e70e34e084fa3981282338	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=10adcff0abe6b3d4cd4ce8c0c330a251
+_md5_=fc9ab7c69dfb3ecb5bbffa305ae36c14
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.14 b/metadata/md5-cache/sys-libs/musl-1.1.14
new file mode 100644
index 000000000000..ee0c5cb627ca
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/musl-1.1.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DESCRIPTION=Light, fast and simple C library focused on standards-conformance and safety
+EAPI=5
+HOMEPAGE=http://www.musl-libc.org/
+IUSE=crosscompile_opts_headers-only
+KEYWORDS=-* amd64 arm ~mips ppc x86
+LICENSE=MIT LGPL-2 GPL-2
+RDEPEND=!sys-apps/getent
+SLOT=0
+SRC_URI=http://www.musl-libc.org/releases/musl-1.1.14.tar.gz
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=c3bb31542fe29a004c4d8ed54e1a6f72
diff --git a/metadata/md5-cache/virtual/python-imaging-2 b/metadata/md5-cache/virtual/python-imaging-2
deleted file mode 100644
index 8489ba06d37c..000000000000
--- a/metadata/md5-cache/virtual/python-imaging-2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for Python Imaging Library
-EAPI=5
-IUSE=jpeg tk python_targets_pypy 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-RDEPEND=dev-python/pillow[jpeg?,tk?,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(-)]
-SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=10202a4ef79304651f0c2f20d2913201
diff --git a/metadata/md5-cache/virtual/ruby-ffi-2 b/metadata/md5-cache/virtual/ruby-ffi-2
index 747cecec5a88..3b7bac856ec5 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-2
+++ b/metadata/md5-cache/virtual/ruby-ffi-2
@@ -6,5 +6,5 @@ IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/ffi[ruby_targets_ruby20] ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b6a59cd94050454cee3ade8b79878ddc
diff --git a/metadata/md5-cache/virtual/ruby-ffi-3 b/metadata/md5-cache/virtual/ruby-ffi-3
index 5611000d2ca4..71a0baf03a73 100644
--- a/metadata/md5-cache/virtual/ruby-ffi-3
+++ b/metadata/md5-cache/virtual/ruby-ffi-3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x8
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/ffi[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/ffi[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/ffi[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/ffi[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 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=005ce93522840a94770f60ced0d72260
diff --git a/metadata/md5-cache/virtual/ruby-minitest-0-r4 b/metadata/md5-cache/virtual/ruby-minitest-0-r4
index 58bfefa539f9..78166d0dfe15 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-0-r4
+++ b/metadata/md5-cache/virtual/ruby-minitest-0-r4
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fb
 RDEPEND=ruby_targets_ruby19? ( || ( dev-ruby/minitest[ruby_targets_ruby19] dev-lang/ruby:1.9 ) ) ruby_targets_ruby20? ( || ( dev-ruby/minitest[ruby_targets_ruby20] dev-lang/ruby:2.0 ) ) ruby_targets_ruby21? ( || ( dev-ruby/minitest[ruby_targets_ruby21] dev-lang/ruby:2.1 ) ) 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=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2c8cb00c66406fc277aca5dfa57e9ff
diff --git a/metadata/md5-cache/virtual/ruby-minitest-1 b/metadata/md5-cache/virtual/ruby-minitest-1
index 8380de581f0b..97b1bb819b12 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-1
+++ b/metadata/md5-cache/virtual/ruby-minitest-1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=ruby_targets_ruby19? ( || ( dev-ruby/minitest[ruby_targets_ruby19] dev-lang/ruby:1.9 ) ) ruby_targets_ruby20? ( || ( dev-ruby/minitest[ruby_targets_ruby20] dev-lang/ruby:2.0 ) ) ruby_targets_ruby21? ( || ( dev-ruby/minitest[ruby_targets_ruby21] dev-lang/ruby:2.1 ) ) ruby_targets_ruby22? ( || ( dev-ruby/minitest[ruby_targets_ruby22] dev-lang/ruby:2.2 ) ) ruby_targets_jruby? ( dev-ruby/minitest[ruby_targets_jruby] ) 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_jruby? ( dev-java/jruby )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_jruby )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba5ff48fc4a8a8352dd8dfe72a790831
diff --git a/metadata/md5-cache/virtual/ruby-ssl-7 b/metadata/md5-cache/virtual/ruby-ssl-7
index 3851b5acc78d..54f8bcc73efe 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-7
+++ b/metadata/md5-cache/virtual/ruby-ssl-7
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fb
 RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9[ssl] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0[ssl] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) 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 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7968f32974ecc3df6972323a1b770937
diff --git a/metadata/md5-cache/virtual/ruby-ssl-8 b/metadata/md5-cache/virtual/ruby-ssl-8
index c23a875f5061..4dd4455d4c18 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-8
+++ b/metadata/md5-cache/virtual/ruby-ssl-8
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0[ssl] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1[ssl] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2[ssl] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3[ssl] ) 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 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=28aa1340d12cbde5f1b8722fddd57fc1
diff --git a/metadata/md5-cache/virtual/rubygems-10 b/metadata/md5-cache/virtual/rubygems-10
index b1cf97c2916a..4996d7ccea33 100644
--- a/metadata/md5-cache/virtual/rubygems-10
+++ b/metadata/md5-cache/virtual/rubygems-10
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[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 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a27003365c96ae55ef2f5dcffaa1a90
diff --git a/metadata/md5-cache/virtual/rubygems-11 b/metadata/md5-cache/virtual/rubygems-11
index af4ae657e11f..12328e73308e 100644
--- a/metadata/md5-cache/virtual/rubygems-11
+++ b/metadata/md5-cache/virtual/rubygems-11
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 RDEPEND=ruby_targets_rbx? ( dev-lang/rubinius ) ruby_targets_ruby19? ( >=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rubygems-2.4.2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rubygems-2.5.1[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_rbx? ( dev-lang/rubinius )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_rbx )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=86fbc3a55d46606a176baa339a74960e
diff --git a/metadata/md5-cache/virtual/rubygems-9 b/metadata/md5-cache/virtual/rubygems-9
index 425a5cf8633c..d32d8c95a4c9 100644
--- a/metadata/md5-cache/virtual/rubygems-9
+++ b/metadata/md5-cache/virtual/rubygems-9
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1860480a8784964a9c92df914488a79
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.37 b/metadata/md5-cache/www-apache/mod_jk-1.2.37
index d3e0ddb35822..dbf55ae1224c 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.37
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.37
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a706c8c23a94cf0bf970f88d719a3fc
diff --git a/metadata/md5-cache/www-apache/mod_jk-1.2.40 b/metadata/md5-cache/www-apache/mod_jk-1.2.40
index 73d45381be58..22ab2b83c07f 100644
--- a/metadata/md5-cache/www-apache/mod_jk-1.2.40
+++ b/metadata/md5-cache/www-apache/mod_jk-1.2.40
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.40-src.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6938da01cc6fed2b737aa308821ec808
diff --git a/metadata/md5-cache/www-apache/passenger-4.0.60 b/metadata/md5-cache/www-apache/passenger-4.0.60
index fa65252328a1..69608cd7ebab 100644
--- a/metadata/md5-cache/www-apache/passenger-4.0.60
+++ b/metadata/md5-cache/www-apache/passenger-4.0.60
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/daemon_controller-1.2.0[ruby_targets_r
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-4.0.60.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f3134945a3a0ed0f848972b01fde5883
diff --git a/metadata/md5-cache/www-apache/passenger-5.0.22 b/metadata/md5-cache/www-apache/passenger-5.0.22
index bbd551a5729d..1868bded7db1 100644
--- a/metadata/md5-cache/www-apache/passenger-5.0.22
+++ b/metadata/md5-cache/www-apache/passenger-5.0.22
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-5.0.22.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cceb8ff59c6c43e65a2175ad3f3beb5
diff --git a/metadata/md5-cache/www-apache/passenger-5.0.23 b/metadata/md5-cache/www-apache/passenger-5.0.23
index e2e7eb89d90f..409a1f1710f9 100644
--- a/metadata/md5-cache/www-apache/passenger-5.0.23
+++ b/metadata/md5-cache/www-apache/passenger-5.0.23
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-5.0.23.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1cc43912dcb7554d9211d69923291e4e
diff --git a/metadata/md5-cache/www-apache/passenger-5.0.24 b/metadata/md5-cache/www-apache/passenger-5.0.24
index b0bb8c1b5443..d0cbf09ca164 100644
--- a/metadata/md5-cache/www-apache/passenger-5.0.24
+++ b/metadata/md5-cache/www-apache/passenger-5.0.24
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=de
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-5.0.24.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=654ac24da138838142a4a4c6b33990ac
diff --git a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3 b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
similarity index 75%
rename from metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3
rename to metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
index 994ca0d1a0b4..575b7dc16035 100644
--- a/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3
+++ b/metadata/md5-cache/www-apps/Apache-Gallery-1.0_rc3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND==dev-lang/perl-5* =www-apache/libapreq2-2*[perl] >=media-libs/imlib2-1.0.6-r1 dev-perl/URI >=dev-perl/ImageInfo-1.04-r2 >=dev-perl/ImageSize-2.99-r1 dev-perl/text-template >=dev-perl/CGI-3.08 dev-perl/Image-Imlib2 =www-servers/apache-2* dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
+DEPEND==dev-lang/perl-5* =www-apache/libapreq2-2*[perl] >=media-libs/imlib2-1.0.6-r1 dev-perl/URI >=dev-perl/Image-Info-1.40.0 >=dev-perl/Image-Size-2.990.0 dev-perl/text-template >=dev-perl/CGI-3.08 dev-perl/Image-Imlib2 =www-servers/apache-2* dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
 DESCRIPTION=Apache gallery for mod_perl
 EAPI=5
 HOMEPAGE=http://apachegallery.dk/
@@ -10,4 +10,4 @@ RDEPEND==www-servers/apache-2* dev-lang/perl:=[-build(-)] >=app-admin/webapp-con
 SLOT=0
 SRC_URI=http://apachegallery.dk/download/Apache-Gallery-1.0RC3.tar.gz
 _eclasses_=depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	15aff0b9cba2282790142295ceb6be0c	perl-module	b2108b3c85ac7a6a6a9b035b54f6813c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=06dd75a4c093509b84d0f8cc111cbef2
+_md5_=15c5ee8e3337f02a6c6b1e648b3bc05d
diff --git a/metadata/md5-cache/www-apps/cgit-9999 b/metadata/md5-cache/www-apps/cgit-9999
index ee11e85e0151..f468ca72188d 100644
--- a/metadata/md5-cache/www-apps/cgit-9999
+++ b/metadata/md5-cache/www-apps/cgit-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/git sys-libs/zlib dev-libs/openssl:0 virtual/httpd-cgi highlight? ( || ( dev-python/pygments app-text/highlight ) ) lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua ) ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=7801b204ee5adea281c33c98a78622f7
+_md5_=7b48b44904821c6ae7e407da6bb083cd
diff --git a/metadata/md5-cache/www-apps/jekyll-2.5.3 b/metadata/md5-cache/www-apps/jekyll-2.5.3
index 405b19134ea5..78fdeb3226da 100644
--- a/metadata/md5-cache/www-apps/jekyll-2.5.3
+++ b/metadata/md5-cache/www-apps/jekyll-2.5.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/classifier-reborn[ruby_targets_ruby20] d
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v2.5.3.tar.gz -> jekyll-2.5.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=21449baf07bad3217b0f966d88eb4318
diff --git a/metadata/md5-cache/www-apps/jekyll-3.1.2 b/metadata/md5-cache/www-apps/jekyll-3.1.2
index 2b16815cfcc4..0c51c6b65b03 100644
--- a/metadata/md5-cache/www-apps/jekyll-3.1.2
+++ b/metadata/md5-cache/www-apps/jekyll-3.1.2
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/colorator[ruby_targets_ruby20] >=dev-rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll/archive/v3.1.2.tar.gz -> jekyll-3.1.2.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4bdae37f4b546f3a612544a61d8e50e5
diff --git a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1 b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
index d892adbb5caa..caaa0e3a9a3a 100644
--- a/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
+++ b/metadata/md5-cache/www-apps/jekyll-coffeescript-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/coffee-script[ruby_targets_ruby20] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-coffeescript/archive/v1.0.1.tar.gz -> jekyll-coffeescript-1.0.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4464cea7590e57fad1369d8163fb60c6
diff --git a/metadata/md5-cache/www-apps/jekyll-gist-1.3.5 b/metadata/md5-cache/www-apps/jekyll-gist-1.3.5
index ededf35efc97..6f4292b672cc 100644
--- a/metadata/md5-cache/www-apps/jekyll-gist-1.3.5
+++ b/metadata/md5-cache/www-apps/jekyll-gist-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-gist/archive/v1.3.5.tar.gz -> jekyll-gist-1.3.5.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e908bf2346fb7a8da34c4ffdd37a7d6
diff --git a/metadata/md5-cache/www-apps/jekyll-gist-1.4.0 b/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
index abbbe2469bb5..ced20fc2ba15 100644
--- a/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-gist-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/octokit-4.2[ruby_targets_ruby20] ) rub
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-gist/archive/v1.4.0.tar.gz -> jekyll-gist-1.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0109313c11576dc0157d3adbc8b33c6
diff --git a/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0 b/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
index fc040a52676e..209e8c5add9d 100644
--- a/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
+++ b/metadata/md5-cache/www-apps/jekyll-paginate-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-paginate/archive/v1.1.0.tar.gz -> jekyll-paginate-1.1.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9bc96ae07be658a6c46a5b524fbcdebf
diff --git a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0 b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
index 9ecadffe6c3d..486884fe9a52 100644
--- a/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
+++ b/metadata/md5-cache/www-apps/jekyll-sass-converter-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/sass:3.4[ruby_targets_ruby20] ) ruby_tar
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sass-converter/archive/v1.4.0.tar.gz -> jekyll-sass-converter-1.4.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=948dfa15f1457ffe3faf42112e9fb139
diff --git a/metadata/md5-cache/www-apps/jekyll-sitemap-0.10.0 b/metadata/md5-cache/www-apps/jekyll-sitemap-0.10.0
index b8905389e1ac..5c346a7bf980 100644
--- a/metadata/md5-cache/www-apps/jekyll-sitemap-0.10.0
+++ b/metadata/md5-cache/www-apps/jekyll-sitemap-0.10.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-la
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-sitemap/archive/v0.10.0.tar.gz -> jekyll-sitemap-0.10.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0af9611482f37876a5b3920af56c5a8b
diff --git a/metadata/md5-cache/www-apps/jekyll-watch-1.3.1 b/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
index afa8fa8de92a..14638a9d66ec 100644
--- a/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
+++ b/metadata/md5-cache/www-apps/jekyll-watch-1.3.1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/listen-3.0[ruby_targets_ruby20] ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/jekyll/jekyll-watch/archive/v1.3.1.tar.gz -> jekyll-watch-1.3.1.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1477a6c5fccd73b86ab3eeaf672cbedf
diff --git a/metadata/md5-cache/www-apps/metadot-6.1.6 b/metadata/md5-cache/www-apps/metadot-6.1.6-r1
similarity index 67%
rename from metadata/md5-cache/www-apps/metadot-6.1.6
rename to metadata/md5-cache/www-apps/metadot-6.1.6-r1
index 146ba13b37b6..2ad60a355980 100644
--- a/metadata/md5-cache/www-apps/metadot-6.1.6
+++ b/metadata/md5-cache/www-apps/metadot-6.1.6-r1
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.metadot.com
 IUSE=vhosts
 KEYWORDS=~x86 ppc
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.005 >=www-apache/mod_perl-2.0 dev-perl/DBI dev-perl/DBD-mysql dev-perl/Apache-DBI dev-perl/XML-RSS virtual/perl-Storable dev-perl/perl-ldap dev-perl/Log-Agent dev-perl/Mail-POP3Client dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unicode-String dev-perl/Spreadsheet-WriteExcel dev-perl/Date-Calc dev-perl/AppConfig dev-perl/ImageSize dev-perl/Template-Toolkit virtual/perl-Time-HiRes dev-perl/Lingua-EN-NameParse dev-perl/Number-Format dev-perl/XML-Simple dev-perl/Text-CSV_XS dev-perl/Archive-Zip dev-perl/DateManip >=app-admin/webapp-config-1.50.15
-SLOT=6.1.6
+RDEPEND=>=dev-lang/perl-5.005 >=www-apache/mod_perl-2.0 dev-perl/DBI dev-perl/DBD-mysql dev-perl/Apache-DBI dev-perl/XML-RSS virtual/perl-Storable dev-perl/perl-ldap dev-perl/Log-Agent dev-perl/Mail-POP3Client dev-perl/IO-stringy dev-perl/MailTools dev-perl/MIME-tools dev-perl/Unicode-String dev-perl/Spreadsheet-WriteExcel dev-perl/Date-Calc dev-perl/AppConfig dev-perl/Image-Size dev-perl/Template-Toolkit virtual/perl-Time-HiRes dev-perl/Lingua-EN-NameParse dev-perl/Number-Format dev-perl/XML-Simple dev-perl/Text-CSV_XS dev-perl/Archive-Zip dev-perl/DateManip >=app-admin/webapp-config-1.50.15
+SLOT=6.1.6-r1
 SRC_URI=http://download.metadot.com/metadot6.1.6.tar.gz
 _eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=e544e8d5469320e65e19be92c3f4e634
+_md5_=7f3c5dfac8ac01dd1487d90960ddc20b
diff --git a/metadata/md5-cache/www-apps/metadot-6.4.5.4 b/metadata/md5-cache/www-apps/metadot-6.4.5.4-r1
similarity index 58%
rename from metadata/md5-cache/www-apps/metadot-6.4.5.4
rename to metadata/md5-cache/www-apps/metadot-6.4.5.4-r1
index 39681e967a4e..a60225f64876 100644
--- a/metadata/md5-cache/www-apps/metadot-6.4.5.4
+++ b/metadata/md5-cache/www-apps/metadot-6.4.5.4-r1
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.metadot.com
 IUSE=vhosts
 KEYWORDS=ppc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6 =www-apache/mod_perl-2* dev-perl/DBI >=dev-perl/DBD-mysql-2.1027 dev-perl/Apache-DBI >=dev-perl/AppConfig-1.55 >=dev-perl/XML-RSS-1.02 dev-perl/perl-ldap >=dev-perl/Log-Agent-0.304 dev-perl/Mail-POP3Client >=dev-perl/IO-stringy-2.108 dev-perl/MailTools dev-perl/MIME-tools >=dev-perl/Unicode-String-2.07 >=dev-perl/Spreadsheet-WriteExcel-0.41 >=dev-perl/Date-Calc-5.3 >=dev-perl/ImageSize-2.991 >=dev-perl/Template-Toolkit-2.09 >=virtual/perl-Time-HiRes-1.48 >=virtual/perl-Test-Harness-2.28 >=dev-perl/Test-Manifest-0.91 >=virtual/perl-Test-Simple-0.47 >=dev-perl/Lingua-EN-NameParse-1.18 >=dev-perl/Number-Format-1.45 >=dev-perl/XML-Simple-2.08 dev-perl/XML-Dumper dev-perl/Archive-Zip dev-perl/DateManip dev-perl/Text-CSV_XS dev-perl/HTML-Tree dev-perl/HTML-Format dev-perl/Data-ShowTable >=app-admin/webapp-config-1.50.15
-SLOT=6.4.5.4
+RDEPEND=>=dev-lang/perl-5.6 =www-apache/mod_perl-2* dev-perl/DBI >=dev-perl/DBD-mysql-2.1027 dev-perl/Apache-DBI >=dev-perl/AppConfig-1.55 >=dev-perl/XML-RSS-1.02 dev-perl/perl-ldap >=dev-perl/Log-Agent-0.304 dev-perl/Mail-POP3Client >=dev-perl/IO-stringy-2.108 dev-perl/MailTools dev-perl/MIME-tools >=dev-perl/Unicode-String-2.07 >=dev-perl/Spreadsheet-WriteExcel-0.41 >=dev-perl/Date-Calc-5.3 >=dev-perl/Image-Size-2.991.0 >=dev-perl/Template-Toolkit-2.09 >=virtual/perl-Time-HiRes-1.48 >=virtual/perl-Test-Harness-2.28 >=dev-perl/Test-Manifest-0.91 >=virtual/perl-Test-Simple-0.47 >=dev-perl/Lingua-EN-NameParse-1.18 >=dev-perl/Number-Format-1.45 >=dev-perl/XML-Simple-2.08 dev-perl/XML-Dumper dev-perl/Archive-Zip dev-perl/DateManip dev-perl/Text-CSV_XS dev-perl/HTML-Tree dev-perl/HTML-Format dev-perl/Data-ShowTable >=app-admin/webapp-config-1.50.15
+SLOT=6.4.5.4-r1
 SRC_URI=http://download.metadot.com/Metadot6.4.5.4.tar.gz
 _eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=6dd70b24009bc79b4cf704e9879776a4
+_md5_=26edb7fd6fd8e4356539bf90775cf5d2
diff --git a/metadata/md5-cache/www-apps/nanoc-3.7.5 b/metadata/md5-cache/www-apps/nanoc-3.7.5
index 4e435f7fdb35..fc909fa0ac3a 100644
--- a/metadata/md5-cache/www-apps/nanoc-3.7.5
+++ b/metadata/md5-cache/www-apps/nanoc-3.7.5
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( !minimal? ( dev-ruby/mime-types[ruby_targets_ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-3.7.5.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9e9084c4f18a95dc613d5e3c33b357e9
diff --git a/metadata/md5-cache/www-apps/nanoc-3.8.0 b/metadata/md5-cache/www-apps/nanoc-3.8.0
index c86f75bbd59a..c06ea8a7c139 100644
--- a/metadata/md5-cache/www-apps/nanoc-3.8.0
+++ b/metadata/md5-cache/www-apps/nanoc-3.8.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-3.8.0.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6197b24c328a52fd91a0a8c4066ee7ec
diff --git a/metadata/md5-cache/www-apps/nanoc-4.1.4 b/metadata/md5-cache/www-apps/nanoc-4.1.4
index f3e23f82fbe4..fa809c350ff5 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.1.4
+++ b/metadata/md5-cache/www-apps/nanoc-4.1.4
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=693a9b1f4d8402c200a5b0951a0c7fab
diff --git a/metadata/md5-cache/www-apps/nanoc-4.1.4-r1 b/metadata/md5-cache/www-apps/nanoc-4.1.4-r1
index 4b5ad4158493..5e9936e7e3fe 100644
--- a/metadata/md5-cache/www-apps/nanoc-4.1.4-r1
+++ b/metadata/md5-cache/www-apps/nanoc-4.1.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby21? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ru
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/nanoc-4.1.4.gem
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a14bcc02b2cb33641adbe4d9f422c076
diff --git a/metadata/md5-cache/www-apps/redmine-2.6.9 b/metadata/md5-cache/www-apps/redmine-2.6.9
index f6aacd3130ab..951bc560f2d5 100644
--- a/metadata/md5-cache/www-apps/redmine-2.6.9
+++ b/metadata/md5-cache/www-apps/redmine-2.6.9
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( dev-ruby/rubygems[ruby_targets_ruby20] >=dev-ruby
 REQUIRED_USE=|| ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://www.redmine.org/releases/redmine-2.6.9.tar.gz
-_eclasses_=depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=depend.apache	e3c541cb90838388f81620d630c28f41	eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=28f3942ba22a4c17523423d8cb61310c
diff --git a/metadata/md5-cache/www-client/epiphany-3.18.4 b/metadata/md5-cache/www-client/epiphany-3.18.4
index a51d97034a43..f47507b15f49 100644
--- a/metadata/md5-cache/www-client/epiphany-3.18.4
+++ b/metadata/md5-cache/www-client/epiphany-3.18.4
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME webbrowser based on Webkit
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 IUSE=nss test debug test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-crypt/gcr-3.5.5 >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-2.9.5:4 >=net-libs/libsoup-2.48:2.4 >=x11-libs/gtk+-3.13:3 >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libwnck:3 x11-libs/libX11 nss? ( dev-libs/nss ) x11-themes/adwaita-icon-theme !www-client/epiphany-extensions
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/3.18/epiphany-3.18.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d8f7fcfaa5822bb9a37ac12e45dac5d1
+_md5_=2c2e62f5cfe1a2b2cd101108d4d6a3b9
diff --git a/metadata/md5-cache/www-client/pybugz-0.12.1 b/metadata/md5-cache/www-client/pybugz-0.12.1
new file mode 100644
index 000000000000..b46e7d06663e
--- /dev/null
+++ b/metadata/md5-cache/www-client/pybugz-0.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Command line interface to (Gentoo) Bugzilla
+EAPI=5
+HOMEPAGE=https://www.github.com/williamh/pybugz
+IUSE=zsh-completion python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[readline(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/williamh/pybugz/archive/0.12.1.tar.gz -> pybugz-0.12.1.tar.gz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d
+_md5_=81b74ea23dd4c1c7f301826091de7e87
diff --git a/metadata/md5-cache/www-servers/adsf-1.2.0 b/metadata/md5-cache/www-servers/adsf-1.2.0
index 1c8247efe1c8..006534adfc56 100644
--- a/metadata/md5-cache/www-servers/adsf-1.2.0
+++ b/metadata/md5-cache/www-servers/adsf-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] ) ru
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ddfreyne/adsf/archive/1.2.0.tar.gz -> adsf-1.2.0.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f41d033e6a0e46fdf8227c1b2b35ec5
diff --git a/metadata/md5-cache/www-servers/resin-4.0.46 b/metadata/md5-cache/www-servers/resin-4.0.46
index 1731869b1b75..2a00db3ca61d 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.46
+++ b/metadata/md5-cache/www-servers/resin-4.0.46
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/jre-1.6 dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-java/validation-api:1.0 dev-java/resin-servlet-api:3.1 dev-java/glassfish-xmlrpc-api:0 dev-java/glassfish-deployment-api:1.2 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.46-src.zip
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a0806c987e38e17de3c84e3a809a2004
diff --git a/metadata/md5-cache/www-servers/thin-1.6.3 b/metadata/md5-cache/www-servers/thin-1.6.3
index fbfe738443ca..41d7ec81eb8c 100644
--- a/metadata/md5-cache/www-servers/thin-1.6.3
+++ b/metadata/md5-cache/www-servers/thin-1.6.3
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.6.3.tar.gz -> thin-1.6.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8eaa6acca0b92abee415605083a7b518
diff --git a/metadata/md5-cache/www-servers/thin-1.6.3-r1 b/metadata/md5-cache/www-servers/thin-1.6.3-r1
index 8b42ec628927..cc0d1e935d47 100644
--- a/metadata/md5-cache/www-servers/thin-1.6.3-r1
+++ b/metadata/md5-cache/www-servers/thin-1.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.6.3.tar.gz -> thin-1.6.3.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2d173d73192343fc4c91ca92927fd2c9
diff --git a/metadata/md5-cache/www-servers/thin-1.6.4-r1 b/metadata/md5-cache/www-servers/thin-1.6.4-r1
index 41798d869be2..359ced3c3698 100644
--- a/metadata/md5-cache/www-servers/thin-1.6.4-r1
+++ b/metadata/md5-cache/www-servers/thin-1.6.4-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/daemons-1.0.9[ruby_targets_ruby19] >=d
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=https://github.com/macournoyer/thin/archive/v1.6.4.tar.gz -> thin-1.6.4.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1b21a0bb521dd0fdc11f59885d25bf92
diff --git a/metadata/md5-cache/www-servers/tomcat-6.0.44-r0 b/metadata/md5-cache/www-servers/tomcat-6.0.44-r0
index 5a4e27fd1bd8..620ec385dc00 100644
--- a/metadata/md5-cache/www-servers/tomcat-6.0.44-r0
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.44-r0
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:3.7 dev-java/tomcat-servlet-api:2.5 >=virtual/jre-1
 RESTRICT=test
 SLOT=6
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09db7b29a0a1629fe8a624a4b0a053e1
diff --git a/metadata/md5-cache/www-servers/tomcat-6.0.44-r2 b/metadata/md5-cache/www-servers/tomcat-6.0.44-r2
index 5763aaea0aca..20a0e7248edb 100644
--- a/metadata/md5-cache/www-servers/tomcat-6.0.44-r2
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.44-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:3.7 dev-java/oracle-javamail:0 >=dev-java/tomcat-servlet-api-6.0.44-r1:2.5 >=virtual/jre-1.6 !<dev-java/tomcat-native-1.1.20 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.44/src/apache-tomcat-6.0.44-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b070e10f59fad1f70a5091520dad9e5e
diff --git a/metadata/md5-cache/www-servers/tomcat-6.0.45 b/metadata/md5-cache/www-servers/tomcat-6.0.45
index 0a518893c585..8b0c2bff63e9 100644
--- a/metadata/md5-cache/www-servers/tomcat-6.0.45
+++ b/metadata/md5-cache/www-servers/tomcat-6.0.45
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:3.7 dev-java/oracle-javamail:0 >=dev-java/tomcat-servlet-api-6.0.44-r1:2.5 >=virtual/jre-1.6 !<dev-java/tomcat-native-1.1.20 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=6
 SRC_URI=mirror://apache/tomcat/tomcat-6/v6.0.45/src/apache-tomcat-6.0.45-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5279db1cb3b44a4f8607c29024c80820
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.59-r2 b/metadata/md5-cache/www-servers/tomcat-7.0.59-r2
index 0b58d56b00ef..f7204b4e2927 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.59-r2
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.59-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 dev-java/tomcat-servlet-api:3.0 websockets? ( >
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.59/src/apache-tomcat-7.0.59-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e269314a0150b894864ba059db44b5b7
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.67 b/metadata/md5-cache/www-servers/tomcat-7.0.67
index 91119aa47fd6..631a2d8ab04e 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.67
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.67
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 dev-java/oracle-javamail:0 dev-java/tomcat-serv
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.67/src/apache-tomcat-7.0.67-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6571c07edb5422300aeae3310c8279c
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.68-r1 b/metadata/md5-cache/www-servers/tomcat-7.0.68-r1
index 6a9cf7197e3f..4436db21581f 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.68-r1
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.68-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 dev-java/tomcat-servlet-api:3.0 websockets? ( >
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.68/src/apache-tomcat-7.0.68-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17bc73d44be225a7b93166d18cefbfe2
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.30 b/metadata/md5-cache/www-servers/tomcat-8.0.30
index f943caed3ab0..025d8047b0bb 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.30
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.30
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 dev-java/oracle-javamail:0 dev-java/tomcat-serv
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.30/src/apache-tomcat-8.0.30-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6fd2eff09fc464694d0afebb6bfc2992
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.32-r1 b/metadata/md5-cache/www-servers/tomcat-8.0.32-r1
index 99c9b749ca4b..132251cf7aeb 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.32-r1
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.32-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.4 dev-java/tomcat-servlet-api:3.1 !<dev-java/tomc
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.32/src/apache-tomcat-8.0.32-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=298d8518c9c299ae78699e2ed2b21d03
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.0_alpha3-r1 b/metadata/md5-cache/www-servers/tomcat-9.0.0_alpha3-r1
index 34bc494df498..b55ea611362a 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.0_alpha3-r1
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.0_alpha3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:4.0 !<dev-java/tomc
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.0.M3/src/apache-tomcat-9.0.0.M3-src.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9b28409558088b66165b6d15fe168c47
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.11.2-r1 b/metadata/md5-cache/www-servers/uwsgi-2.0.11.2-r1
index e85bcf482a49..8c1f51ce99e8 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.11.2-r1
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.11.2-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) php? ( || ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.11.2.tar.gz -> uwsgi-2.0.11.2.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dad7de7ab4bc9ae334b03bef6e8f7ea7
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.12 b/metadata/md5-cache/www-servers/uwsgi-2.0.12
index ed398c3b2b5f..7b18960326e4 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.12
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.12
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl lua php pypy python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) uwsgi_plugins_router_xmldir? ( xml ) pypy? ( python_targets_python2_7 ) python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) php? ( || ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 php_targets_php7-0 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.12.tar.gz -> uwsgi-2.0.12.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db36ab59cda62740d35a594d6db61b01
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.9 b/metadata/md5-cache/www-servers/uwsgi-2.0.9
index 871f780eb3a5..16801ca9dc6d 100644
--- a/metadata/md5-cache/www-servers/uwsgi-2.0.9
+++ b/metadata/md5-cache/www-servers/uwsgi-2.0.9
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) json? ( !yajl? ( dev-libs/jansso
 REQUIRED_USE=|| ( cgi mono perl lua php python python_asyncio python_gevent ruby ) uwsgi_plugins_logcrypto? ( ssl ) uwsgi_plugins_sslrouter? ( ssl ) routing? ( pcre ) uwsgi_plugins_emperor_zeromq? ( zeromq ) uwsgi_plugins_router_xmldir? ( xml ) uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ) python_asyncio? ( python_targets_python3_4 python_gevent ) python_gevent? ( python ) expat? ( xml ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) php? ( || ( php_targets_php5-4 php_targets_php5-5 ) )
 SLOT=0
 SRC_URI=https://github.com/unbit/uwsgi/archive/2.0.9.tar.gz -> uwsgi-2.0.9.tar.gz
-_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	autotools	07e71b3b5690738ef7e8bc097077e00c	depend.apache	e3c541cb90838388f81620d630c28f41	distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=25afc976e7b1a47455961626f164c12d
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.32.3 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.32.3
index 52121a0ab370..ad35f81258df 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.32.3
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.32.3
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=X debug +introspection jpeg jpeg2k tiff 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.37.6: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(-)?] >=media-libs/libpng-1.4: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg: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(-)?] ) jpeg2k? ( media-libs/jasper:=[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(-)?] ) tiff? ( >=media-libs/tiff-3.9.2: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(-)?] ) X? ( x11-libs/libX11[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(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.32/gdk-pixbuf-2.32.3.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ee474ca0b44bd32af74e7cf739104544
+_md5_=b8f80c12170c670934e199e6b7df241e
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.27 b/metadata/md5-cache/x11-libs/goffice-0.10.27
index 6f0e214fb4a6..fcf3fbca450c 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.10.27
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.27
@@ -4,10 +4,10 @@ DESCRIPTION=A library of document-centric objects and utilities
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/goffice/
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.38.0:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24:= >=x11-libs/cairo-1.10:=[svg] x11-libs/libXext:= x11-libs/libXrender:= >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.8.7:3 introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
 SLOT=0.10
 SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.27.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9fd417650c61f8322e94ea5b1aa2f7d6
+_md5_=13b3c723fd53decb221f64edca464094
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.29 b/metadata/md5-cache/x11-libs/gtk+-2.24.29
index fb219c6a3756..256d645247b1 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.29
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.29
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=aqua cups examples +introspection test vim-syntax xinerama debug 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[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(-)?] vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.10.0[introspection?,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.34.3: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(-)?] >=media-libs/fontconfig-2.10.92[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/cairo-1.12.14-r4:=[aqua?,svg,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.30.7:2[introspection?,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/pango-1.36.3[introspection?,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-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[X] >=x11-libs/gdk-pixbuf-2.30.7:2[X] >=x11-libs/libXrender-0.9.8[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/libX11-1.6.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/libXi-1.7.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/libXext-1.3.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/libXrandr-1.4.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/libXcursor-1.1.14[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/libXfixes-5.0.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(-)?] >=x11-libs/libXcomposite-0.4.4-r1[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/libXdamage-1.1.4-r1[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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[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-util/gtk-update-icon-cache-2 !<gnome-base/gail-1000 !<dev-util/gtk-builder-convert-2.24.29 !<x11-libs/vte-0.28.2-r201:0
@@ -12,4 +12,4 @@ REQUIRED_USE=xinerama? ( !aqua )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.29.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3a734b3d388ef52cda00beb35ae28c65
+_md5_=10b349734cd50bb75fd079409f530c1c
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.18.7 b/metadata/md5-cache/x11-libs/gtk+-3.18.7
index a62a27b2a3e8..a2e8a2405df2 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.18.7
+++ b/metadata/md5-cache/x11-libs/gtk+-3.18.7
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama debug 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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[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(-)?] vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,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.45.8: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(-)?] media-libs/fontconfig[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(-)?] >=media-libs/libepoxy-1.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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,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.30:2[introspection?,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/pango-1.37.3[introspection?,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-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[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/json-glib-1.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(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.5.91[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(-)?] media-libs/mesa[wayland,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/libxkbcommon-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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[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/libXrender[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/libX11[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/libXi-1.3[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/libXext[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/libXrandr-1.5[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/libXcursor[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/libXfixes[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/libXcomposite[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/libXdamage[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(-)?] xinerama? ( x11-libs/libXinerama[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-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90 >=x11-themes/adwaita-icon-theme-3.14 X? ( !<x11-base/xorg-server-1.11.4 )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.18/gtk+-3.18.7.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8a9445d904846083a7946071c8099889
+_md5_=e975840e512368de3cadc04d9ab7875b
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.18.2 b/metadata/md5-cache/x11-libs/gtksourceview-3.18.2
index 697db1f98a72..6c46fac2514b 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.18.2
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.18.2
@@ -4,11 +4,11 @@ DESCRIPTION=A text widget implementing syntax highlighting and other features
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=glade +introspection vala test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.16:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=031097cc3e14c8570ba42913914a0302
+_md5_=d75e138cc459a2f9d65591c2bfaa3ea0
diff --git a/metadata/md5-cache/x11-libs/libwnck-3.14.1 b/metadata/md5-cache/x11-libs/libwnck-3.14.1
index e8b871900b7b..4ea14cecd04f 100644
--- a/metadata/md5-cache/x11-libs/libwnck-3.14.1
+++ b/metadata/md5-cache/x11-libs/libwnck-3.14.1
@@ -4,10 +4,10 @@ DESCRIPTION=A window navigation construction kit
 EAPI=5
 HOMEPAGE=https://developer.gnome.org/libwnck/stable/
 IUSE=+introspection startup-notification tools
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=x11-libs/cairo[X] >=x11-libs/gtk+-3.10:3[introspection?] >=dev-libs/glib-2.32:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 ) x86-interix? ( sys-libs/itx-bind )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libwnck/3.14/libwnck-3.14.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5b54ae292e593ab7c6e5173f6b393747
+_md5_=dba5139fa42a30b09726cc6a93c3a203
diff --git a/metadata/md5-cache/x11-libs/pango-1.38.1 b/metadata/md5-cache/x11-libs/pango-1.38.1
index b2b6d5612e91..c1dba546beaa 100644
--- a/metadata/md5-cache/x11-libs/pango-1.38.1
+++ b/metadata/md5-cache/x11-libs/pango-1.38.1
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=5
 HOMEPAGE=http://www.pango.org/
 IUSE=X +introspection test debug 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),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.34.3: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(-)?] >=media-libs/fontconfig-2.10.92:1.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(-)?] >=media-libs/freetype-2.5.0.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/cairo-1.12.14-r4:=[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[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/libX11-1.6.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/libXft-2.3.1-r1[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=0
 SRC_URI=mirror://gnome/sources/pango/1.38/pango-1.38.1.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e3f215bb629b5750aa5f5fa4e821dbfe
+_md5_=4b7dbfe35ecde5f92d5e9f46189993f7
diff --git a/metadata/md5-cache/x11-libs/vte-0.42.4 b/metadata/md5-cache/x11-libs/vte-0.42.4
index ab9d8a06c151..efc27d994e8c 100644
--- a/metadata/md5-cache/x11-libs/vte-0.42.4
+++ b/metadata/md5-cache/x11-libs/vte-0.42.4
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
 IUSE=+crypt debug glade +introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.8:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !x11-libs/vte:2.90[glade]
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.42/vte-0.42.4.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	f946609697ad4b4b1d85b997f0c70204	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8a5a084ca985e482a5c2e7b0a6b2394b
+_md5_=1f02cb3138301d63a2e087fd8052ef7e
diff --git a/metadata/md5-cache/x11-misc/lxmed-20110717 b/metadata/md5-cache/x11-misc/lxmed-20110717
index 7c20df87cea6..c2893bcde96a 100644
--- a/metadata/md5-cache/x11-misc/lxmed-20110717
+++ b/metadata/md5-cache/x11-misc/lxmed-20110717
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 x11-libs/gksu
 SLOT=0
 SRC_URI=mirror://sourceforge/lxmed/lxmed-20110717.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1f09a5588bb3086227e4b321d0a27bc2
diff --git a/metadata/md5-cache/x11-misc/lxmed-20120515 b/metadata/md5-cache/x11-misc/lxmed-20120515
index e9668ad93b07..a3894d844c2b 100644
--- a/metadata/md5-cache/x11-misc/lxmed-20120515
+++ b/metadata/md5-cache/x11-misc/lxmed-20120515
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.5 x11-libs/gksu
 SLOT=0
 SRC_URI=mirror://sourceforge/lxmed/lxmed-20120515.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome2-utils	d19e7813f27c8f982134d657889b13cf	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=e42fd6bad83fe18831c1b8cd8a81c508
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.18.2 b/metadata/md5-cache/x11-terms/gnome-terminal-3.18.2
index afbf10dda1de..44efb37aba7e 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.18.2
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=The Gnome Terminal
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/
 IUSE=debug +gnome-shell +nautilus vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.42:2[dbus] >=x11-libs/gtk+-3.10:3[X] >=x11-libs/vte-0.42.1:2.91 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux x11-libs/libSM x11-libs/libICE gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.18/gnome-terminal-3.18.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	readme.gentoo	df3fc8fdaf5a519e7d48c83e7592c95f	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=02242a6351c95c5fc7a12538eab4b191
+_md5_=dc161b57b988f589be2c228e7ddb2a03
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.18.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.18.0
index 10f67904c68d..e2f3355af401 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.18.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME default icon theme
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-Sampling-Plus-1.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/gnome-themes-standard-3.14
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.18/adwaita-icon-theme-3.18.0.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3cc5651463e3cd8e5155b7f5e6d28a5d
+_md5_=f9c9a0a84bbbfe6772d91c6e39e1cc71
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.18.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.18.0
index 84275688a044..ab48adbc3ffc 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-3.18.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-3.18.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/intltool-0.40.0 sys-devel/gettext app-arch/xz-utils >=sys-apps
 DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-backgrounds
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!<x11-themes/gnome-themes-standard-3.14
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-backgrounds/3.18/gnome-backgrounds-3.18.0.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=600e710c318edfecf541c0e8fefd3739
+_md5_=032bb309a8a70c12d81f60fe6589b200
diff --git a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.18.0 b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.18.0
index a19bf69309de..05457b9921c1 100644
--- a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.18.0
+++ b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.18.0
@@ -4,10 +4,10 @@ DESCRIPTION=Standard Themes for GNOME Applications
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gnome-themes-standard/
 IUSE=+gtk 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 ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=gnome-base/librsvg: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/cairo[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(-)?] gtk? ( >=x11-libs/gtk+-2.24.15: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.12:3[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(-)?] ) >=gnome-base/gsettings-desktop-schemas-3.4 !<x11-themes/gnome-themes-2.32.1-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-standard/3.18/gnome-themes-standard-3.18.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0c5345de5304893856e44df35b8746c3
+_md5_=c24e3e800a1ec039219843252f363fb9
diff --git a/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r160 b/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r161
similarity index 96%
rename from metadata/md5-cache/x11-themes/mate-themes-1.10.5-r160
rename to metadata/md5-cache/x11-themes/mate-themes-1.10.5-r161
index eaa78de53378..f3d5d688635a 100644
--- a/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r160
+++ b/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r161
@@ -7,7 +7,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.16:3 !>=x11-libs/gtk+-3.17:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine
 RESTRICT=binchecks strip
-SLOT=0
+SLOT=0/3.16
 SRC_URI=http://pub.mate-desktop.org/releases/1.10/mate-themes-gtk3.16-1.10.5.tar.xz -> mate-themes-1.10.5-gtk3.16.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a1461d961dc2191fa0612df47256b0ed
+_md5_=1243132ac6c222044e04547782114c0d
diff --git a/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r180 b/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r181
similarity index 96%
rename from metadata/md5-cache/x11-themes/mate-themes-1.10.5-r180
rename to metadata/md5-cache/x11-themes/mate-themes-1.10.5-r181
index 651b526dec98..8d9bb03e7b85 100644
--- a/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r180
+++ b/metadata/md5-cache/x11-themes/mate-themes-1.10.5-r181
@@ -7,7 +7,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 !<x11-libs/gtk+-3.18:3 !>=x11-libs/gtk+-3.19:3 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine
 RESTRICT=binchecks strip
-SLOT=0
+SLOT=0/3.18
 SRC_URI=http://pub.mate-desktop.org/releases/1.10/mate-themes-gtk3.18-1.10.5.tar.xz -> mate-themes-1.10.5-gtk3.18.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a1461d961dc2191fa0612df47256b0ed
+_md5_=1243132ac6c222044e04547782114c0d
diff --git a/metadata/md5-cache/x11-themes/mate-themes-meta-1.10 b/metadata/md5-cache/x11-themes/mate-themes-meta-1.10
new file mode 100644
index 000000000000..af2995852b8a
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/mate-themes-meta-1.10
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package to facilitate easy use of x11-themes/mate-themes
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=|| ( ( =x11-libs/gtk+-3.16*:3 =x11-themes/mate-themes-1.10*:0/3.16 ) ( =x11-libs/gtk+-3.18*:3 =x11-themes/mate-themes-1.10*:0/3.18 ) =x11-themes/mate-themes-1.10*:0 )
+SLOT=0
+_md5_=8c28f1ec864559fb4b816274642cadbb
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.17.9999 b/metadata/md5-cache/x11-wm/enlightenment-0.17.9999
index d2ceec586c38..691c067de469 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.17.9999
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.17.9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.2.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.16[X] >=media-libs/elementary-1.16 x11-libs/xcb-util-keysyms dev-vcs/git !<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 doc? ( app-doc/doxygen )
+DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.2.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms dev-vcs/git !<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 doc? ( app-doc/doxygen )
 DESCRIPTION=Enlightenment DR17 window manager
 EAPI=5
 HOMEPAGE=http://www.enlightenment.org/
 IUSE=pam spell static-libs systemd +udev ukit wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_bluez4 +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_packagekit +enlightenment_modules_pager-plain +enlightenment_modules_policy-mobile +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_winlist +enlightenment_modules_wizard +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland nls doc
 LICENSE=BSD-2
-RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.2.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.16[X] >=media-libs/elementary-1.16 x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
+RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.2.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
 SLOT=0.17/0.17.9999
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	enlightenment	c185b1fa0d87798fd07fb1cd85866b23	eutils	9d81603248f2ba3ec59124320d123e5e	git-2	df00117322129fb906bb0a53c3d6a020	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=158b2606d0b14b81840b24b159950359
+_md5_=712d08bae0418d2c2e871e1a625ea422
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.20.5 b/metadata/md5-cache/x11-wm/enlightenment-0.20.5
new file mode 100644
index 000000000000..34f2382c4e00
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.20.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.2.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms doc? ( app-doc/doxygen )
+DESCRIPTION=Enlightenment DR17 window manager
+EAPI=5
+HOMEPAGE=http://www.enlightenment.org/
+IUSE=pam spell static-libs systemd +udev ukit wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_bluez4 +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_packagekit +enlightenment_modules_pager-plain +enlightenment_modules_policy-mobile +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_winlist +enlightenment_modules_wizard +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland nls doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-interix ~x86-solaris ~x64-solaris
+LICENSE=BSD-2
+RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.2.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.17[X] >=media-libs/elementary-1.17 x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
+SLOT=0.17/0.20.5
+SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.20.5.tar.xz
+_eclasses_=enlightenment	c185b1fa0d87798fd07fb1cd85866b23	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=712d08bae0418d2c2e871e1a625ea422
diff --git a/metadata/md5-cache/x11-wm/muffin-2.8.4 b/metadata/md5-cache/x11-wm/muffin-2.8.4
index 38c07c64b15d..d9494523bf83 100644
--- a/metadata/md5-cache/x11-wm/muffin-2.8.4
+++ b/metadata/md5-cache/x11-wm/muffin-2.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
 EAPI=5
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+introspection test xinerama
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/2.8.4.tar.gz -> muffin-2.8.4.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	8eb13cdf35f6e43c48107b911900b2cc	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3ae05955ed4459d65b65eaf0c62ebfc7
+_md5_=93fb939a1bcab78d814c6027ca3c657d
diff --git a/metadata/md5-cache/x11-wm/mutter-3.18.2-r1 b/metadata/md5-cache/x11-wm/mutter-3.18.2-r1
index 0fa3b06a166e..64dc20d19796 100644
--- a/metadata/md5-cache/x11-wm/mutter-3.18.2-r1
+++ b/metadata/md5-cache/x11-wm/mutter-3.18.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME 3 compositing window manager based on Clutter
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/mutter/
 IUSE=+introspection +kms test wayland debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.9.11:3[X,introspection?] >=dev-libs/glib-2.36.0:2[dbus] >=media-libs/clutter-1.23.4:1.0[X,introspection?] >=media-libs/cogl-1.17.1:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.2 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.4 x11-libs/libXinerama >=x11-libs/libXrandr-1.5 x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-1.42:= ) kms? ( dev-libs/libinput >=media-libs/clutter-1.20[egl] media-libs/cogl:1.0=[kms] >=media-libs/mesa-10.3[gbm] sys-apps/systemd virtual/libgudev x11-libs/libdrm:= ) wayland? ( >=dev-libs/wayland-1.6.90 >=media-libs/clutter-1.20[wayland] x11-base/xorg-server[wayland] ) !x11-misc/expocity
 SLOT=0
 SRC_URI=mirror://gnome/sources/mutter/3.18/mutter-3.18.2.tar.xz
 _eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	2096a489d1689a40b2a4c434c3e79236	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2bec1e84522481e56b63dcee637ca734
+_md5_=622dedb4e9acf48e2ed071c00341f7a5
diff --git a/metadata/md5-cache/x11-wm/subtle-0.11.3244 b/metadata/md5-cache/x11-wm/subtle-0.11.3244
index 170c6a421a59..9f43406a6b05 100644
--- a/metadata/md5-cache/x11-wm/subtle-0.11.3244
+++ b/metadata/md5-cache/x11-wm/subtle-0.11.3244
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXineram
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/subtle-0.11.3244.tar.gz
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c63177ac3a60c11e760ce8a2e7d58b4
diff --git a/metadata/md5-cache/x11-wm/subtle-9999 b/metadata/md5-cache/x11-wm/subtle-9999
index b9a08fa18d85..619d723c35a9 100644
--- a/metadata/md5-cache/x11-wm/subtle-9999
+++ b/metadata/md5-cache/x11-wm/subtle-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) xtest? ( x11-libs/libXtst ) xrandr? ( x11-libs/libXrandr ) ruby_targets_ruby20? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/archive-tar-minitar[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 )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	51a42ff2f35cd75af735cd1626829b06	mercurial	789038b352d112bcff9dff083aa40d8d	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	java-utils-2	4f0e83a2c108b9f3d74ecebf32e2f483	mercurial	789038b352d112bcff9dff083aa40d8d	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c63177ac3a60c11e760ce8a2e7d58b4
diff --git a/metadata/md5-cache/x11-wm/xpra-0.14.34 b/metadata/md5-cache/x11-wm/xpra-0.14.34
new file mode 100644
index 000000000000..c49c0dab316a
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/xpra-0.14.34
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
+EAPI=5
+HOMEPAGE=http://xpra.org/ http://xpra.org/src/
+IUSE=+client +clipboard csc dec_av dec_av2 libav lz4 lzo opengl pulseaudio +rencode server sound vpx webp x264 x265 python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/setxkbmap x11-apps/xmodmap lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void x11-drivers/xf86-video-dummy ) python_targets_python2_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 ) clipboard? ( || ( server client ) ) opengl? ( client ) || ( client server ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://xpra.org/src/xpra-0.14.34.tar.xz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=15f275d600755a299f93bb681d5ba648
diff --git a/metadata/md5-cache/x11-wm/xpra-0.15.10 b/metadata/md5-cache/x11-wm/xpra-0.15.10-r1
similarity index 76%
rename from metadata/md5-cache/x11-wm/xpra-0.15.10
rename to metadata/md5-cache/x11-wm/xpra-0.15.10-r1
index dfc1d7b1889d..cd311df5ca24 100644
--- a/metadata/md5-cache/x11-wm/xpra-0.15.10
+++ b/metadata/md5-cache/x11-wm/xpra-0.15.10-r1
@@ -3,12 +3,12 @@ DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/p
 DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
 EAPI=5
 HOMEPAGE=http://xpra.org/ http://xpra.org/src/
-IUSE=+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265 python_targets_python2_7
+IUSE=+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265 python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/setxkbmap x11-apps/xmodmap server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void x11-drivers/xf86-video-dummy ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/setxkbmap x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void x11-drivers/xf86-video-dummy ) python_targets_python2_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 ) clipboard? ( || ( server client ) ) opengl? ( client ) || ( client server ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-0.15.10.tar.xz
 _eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0fc5431c92be8b592413be2232150919
+_md5_=eb4b471b4843f10f72937c228b845f28
diff --git a/metadata/md5-cache/x11-wm/xpra-0.15.6 b/metadata/md5-cache/x11-wm/xpra-0.15.6
deleted file mode 100644
index 580a2ba45596..000000000000
--- a/metadata/md5-cache/x11-wm/xpra-0.15.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
-EAPI=5
-HOMEPAGE=http://xpra.org/ http://xpra.org/src/
-IUSE=+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265 python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/setxkbmap x11-apps/xmodmap server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void x11-drivers/xf86-video-dummy ) python_targets_python2_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 ) clipboard? ( || ( server client ) ) opengl? ( client ) || ( client server ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://xpra.org/src/xpra-0.15.6.tar.xz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=359c37101fdc8927273df73cc78c76de
diff --git a/metadata/md5-cache/x11-wm/xpra-0.15.7 b/metadata/md5-cache/x11-wm/xpra-0.15.7
deleted file mode 100644
index 1e5bb25eec37..000000000000
--- a/metadata/md5-cache/x11-wm/xpra-0.15.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
-EAPI=5
-HOMEPAGE=http://xpra.org/ http://xpra.org/src/
-IUSE=+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265 python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/setxkbmap x11-apps/xmodmap server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void x11-drivers/xf86-video-dummy ) python_targets_python2_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 ) clipboard? ( || ( server client ) ) opengl? ( client ) || ( client server ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://xpra.org/src/xpra-0.15.7.tar.xz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0fc5431c92be8b592413be2232150919
diff --git a/metadata/md5-cache/x11-wm/xpra-0.15.8 b/metadata/md5-cache/x11-wm/xpra-0.15.8
deleted file mode 100644
index 3ffc481ade4d..000000000000
--- a/metadata/md5-cache/x11-wm/xpra-0.15.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
-EAPI=5
-HOMEPAGE=http://xpra.org/ http://xpra.org/src/
-IUSE=+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265 python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/setxkbmap x11-apps/xmodmap server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void x11-drivers/xf86-video-dummy ) python_targets_python2_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 ) clipboard? ( || ( server client ) ) opengl? ( client ) || ( client server ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://xpra.org/src/xpra-0.15.8.tar.xz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0fc5431c92be8b592413be2232150919
diff --git a/metadata/md5-cache/x11-wm/xpra-0.15.9 b/metadata/md5-cache/x11-wm/xpra-0.15.9
deleted file mode 100644
index 776a13e4f09c..000000000000
--- a/metadata/md5-cache/x11-wm/xpra-0.15.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
-EAPI=5
-HOMEPAGE=http://xpra.org/ http://xpra.org/src/
-IUSE=+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265 python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 dev-python/gst-python:0.10 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/setxkbmap x11-apps/xmodmap server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void x11-drivers/xf86-video-dummy ) python_targets_python2_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 ) clipboard? ( || ( server client ) ) opengl? ( client ) || ( client server ) || ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://xpra.org/src/xpra-0.15.9.tar.xz
-_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0fc5431c92be8b592413be2232150919
diff --git a/metadata/md5-cache/x11-wm/xpra-0.16.2 b/metadata/md5-cache/x11-wm/xpra-0.16.2
new file mode 100644
index 000000000000..3c5f0c708997
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/xpra-0.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
+EAPI=5
+HOMEPAGE=http://xpra.org/ http://xpra.org/src/
+IUSE=+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265 python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_av2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void x11-drivers/xf86-video-dummy ) python_targets_python2_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 ) clipboard? ( || ( server client ) ) opengl? ( client ) || ( client server ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://xpra.org/src/xpra-0.16.2.tar.xz
+_eclasses_=distutils-r1	4e8ac1ba76ddacd8f7c0289aa586a34c	eutils	9d81603248f2ba3ec59124320d123e5e	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=6b2d308e3c1ae1e4badeee4da47302bb
diff --git a/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0 b/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
index f3d6f10e9cff..70324460773b 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
+++ b/metadata/md5-cache/xfce-extra/xfce4-composite-editor-0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-shells/bash >=x11-misc/gtkdialog-0.8 >=sys-apps/sed-4
+DEPEND=app-shells/bash:* >=x11-misc/gtkdialog-0.8 >=sys-apps/sed-4
 DESCRIPTION=An graphical interface to modify composite settings
 EAPI=5
 HOMEPAGE=http://keithhedger.hostingsiteforfree.com/pages/apps.html#xfcecomp
 KEYWORDS=~amd64 x86
 LICENSE=GPL-3
-RDEPEND=app-shells/bash >=x11-misc/gtkdialog-0.8
+RDEPEND=app-shells/bash:* >=x11-misc/gtkdialog-0.8
 SLOT=0
 SRC_URI=http://keithhedger.hostingsiteforfree.com/zips/Xfce4-Composite-Editor.tar.gz -> Xfce4-Composite-Editor-0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	d19e7813f27c8f982134d657889b13cf	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48	xfconf	d842ab8b2140980394561496bf157447
-_md5_=549be12f0341676fe4ddfaec81852ff5
+_md5_=c08979545ae6ec4c9147e53090027022
diff --git a/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt b/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt
index b377f2dc112c..11017ab2b1c9 100644
--- a/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt
+++ b/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt
@@ -2,9 +2,9 @@ Title: Ruby 1.8 removal; Ruby 1.9/2.0 default
 Author: Manuel Rüger <mrueg@gentoo.org>
 Content-Type: text/plain
 Posted: 2014-03-16
-Revision: 1
+Revision: 2
 News-Item-Format: 1.0
-Display-If-Installed: dev-lang/ruby
+Display-If-Installed: <dev-lang/ruby-1.9
 
 Ruby MRI 1.8 has been retired by upstream in June 2013.[1]
 We remove Ruby MRI 1.8 support from the tree now. In parallel Ruby MRI 2.0 
diff --git a/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt.asc b/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt.asc
index 3977b14d184c..75b0f0cef9b5 100644
--- a/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt.asc
+++ b/metadata/news/2014-03-16-ruby-1.8-removal/2014-03-16-ruby-1.8-removal.en.txt.asc
@@ -1,19 +1,32 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v2.0
 
-iQJ8BAABCgBmBQJTJO1IXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4MDA1RERERkM0ODM2QkE4MEY3NzY0N0M1
-OEZCQTM2QzhEOUQ2MzVDAAoJEFj7o2yNnWNcfWwP/2fBtO1qxBWkxCNf3f5jB7zk
-fcicNKHbGd9GLR/PpD9AoOmVl4RZOZp5f/t8iyg7UGXmw+pSV3cJUARlcBIbVdIs
-f4OxCUEbfhGR8CJHZnA9Xp0XefMJe8G0ZcJWaMPLNI1HYNeIvjdL1kqKmQYbuIzQ
-wd87wfYn9ggVpPub2Hv8HjbxndiAOGbOYuLIjmj8Le8uXxyqbkraxvGBdQrLXqGx
-5ib9e1bi9Ae2Hu3axEgc5umepFMCiUMIkqpH2DTDf4cQAJT4bTQIALstRsWge/4U
-OC7b5Eu7dIcNRUgnw1IRx53DWKvWMU+pDu+l3+2gBQKxgCt0NB9tW3RjjsholbGU
-JbyUxw17L7UpE1yt+buV61Fd1RhvHFJB5xUBzcVuYTlUEKoxKhxmG5swkmr7lyr6
-8TDHJRQOUY92zWKKwZkPFQlf7s5PZAGPY3NJfrNO/bhjUN+PgJRifbX2IzCrsiSJ
-v8XR/OCGxyW5jglCnqA5iMduBbXRbH2SCsMoI2tXLWIqbaqPRZKSJfkcXizvGD60
-4lUtF0T0pUc68TWGV/i/p3nUc4q/P0UtHheGd/zgNXZGsP4MkimwOB9owZb2LXtO
-o08W8WDZvuoGndBjGpcMELxculK4Q5s6tS0bceC9OwRRT4kobKfHYnz+FO8/N/Hj
-YhaL5zin25OO2R7wu3gp
-=iXP2
------END PGP SIGNATURE-----
+owFtU31QVFUcXfAjfRPqqDiWGDeisXLfvl2RhV1RWdhdXWWRljV10JG3u3fZp++r
+9+7bdZUMY0IUcBQNxSTdFMpEJtKp0bSP1czElMlMx89GchxH0owiCbPuWzFz8v13
+3z3n3HPO/d21Cf00RNzA1q6aY7ZIZ9zufmFPygS9YSKpTyMNRlJSPGHSoMskJcgJ
+QZrVQV6HlqBXvukudjOIhWbgwgiAEaAPMenBHxM1QacHPuinFRYRFgUFBMkMnDSv
+QBa4Dh0ogRLI4iQFlmSXQB4Jgk6QSqYQuQKP8JJ0h0WsjuASRIkszfBEgSAj6DOD
+h+4IFwwyMiPw+CeRD0My6UCQI+2CxNHIjC3oCSsjY3aYdPhJBy8jmmVViSwfDJIs
+zZdQfflMBBFz7XQ5YlkCtAw8EPI4FGIk6AN4TxFlJEGaAwwPZig8VI2k6YoMC4g5
+8H54CB4RkRVRFCQE/JLAARSAANMh4IWQDjh4INKS6oZ9yFHrIh6QQgzLYguA9iIm
+SOPg6rEeWoZAlAQ/w8JxMnDNzpm30G1xTbO5C0GQlhjaw0LVal/pgMAcr8AvUnis
+IvBYFAX+69GkIwiHH4QFRQJeRZJw72wYQBmy0KseGYMy+D4kEReB74uRgdqYIVML
+VI4EvQLHQd5Hx+TxLoEE4A3gZiFgEMCLGNykAxYUq4ATMBw94gG7ZZkglOQYwANl
+BERBlhk1y791CH6A2/qfIVltRa0VB8kNQO/imEZfFCBDhBi+BAQZ2kwQg/tyxSwB
+OSCEVE7M6uNI2PsjLh8rAlFfQILAgwACCImymaJCoZAuNlnqjKljTUGe4vGAUurM
+UHojlaanQpC8P12kgcwkMyhiVbynvyaO0OQNiFffl21kmQZ/IzUvMLKsQIn0i1I2
+L6BY17Ipw2QwmozWDGtahtFqybCZcox2Q7peb8wx2NMyrbmWiekWgy1XQwwe9uB1
+bywbem9KjyAaZ0R+GtNr37z+k6J93GHXxaQKzrhi/6gXJ68pXSyuqvH6y/XnN3VU
+5Wn97yacryjQdCgHOMpWd+bHdevOZg+KupbOj9S3xA3q2hEabO269n10mmN6/eno
+oJlLFrLhr/c5awPTne0Nke2aqtzshU0biFk364rNHQO8HxYdnrvtvaSnG3+pKFvp
+/Dy5cMuIhgup2qbo1DcaLku+uraDK54svXciueWv2orm1Bv1d3vqh+VrN6fsSOil
+b4Xn/X7jqPfKqJo3j7Rda2tO/LuueFfSzjMbo09t3Vu+99Wa+aMjjkJ7cyJ3unjo
+perKQN7YmZPHF0VH//HDx503P72U+FYKWfFM4/T3Uxet0nQ/u03qiV+2NW9udsT9
+xI6qnq2lbf0r006vOR7ubN+z//nq2ZHhxZ/Vzur96pzy0gHttgSysvr2c+U1445e
+bLIPYBdcDR88durOPSbcYh3ZGBbGZ1Yl170cl/DbXqZxFF02tDnfubPqaofdmrR7
+zNSV1fnXe8/tmX/no47rnfXLEz9YtvpbJbU7UpCUfuJC4eYvguVHzrRGdbPj3Tfn
+NDM1DZvOLR1+4cjbTaW3tp/dmOybutr5esqkaSfHDkzfdfJua6j/9j+/O1yZP+LX
+Vq2id1zUbVivPWE57r0k2662n3VbHEu/XB5650rLwVOLhqzN8oUvU0fNW36+Ufva
+oayc87eHdLUv/wc=
+=4QwK
+-----END PGP MESSAGE-----
diff --git a/metadata/news/2015-08-26-ruby-19-removal/2015-08-26-ruby-19-removal.en.txt b/metadata/news/2015-08-26-ruby-19-removal/2015-08-26-ruby-19-removal.en.txt
index ddb00ac7b820..97c2465f7004 100644
--- a/metadata/news/2015-08-26-ruby-19-removal/2015-08-26-ruby-19-removal.en.txt
+++ b/metadata/news/2015-08-26-ruby-19-removal/2015-08-26-ruby-19-removal.en.txt
@@ -2,9 +2,9 @@ Title: Ruby 1.9 removal; Ruby 2.0/2.1 default
 Author: Manuel Rüger <mrueg@gentoo.org>
 Content-Type: text/plain
 Posted: 2015-08-26
-Revision: 1
+Revision: 2
 News-Item-Format: 1.0
-Display-If-Installed: dev-lang/ruby
+Display-If-Installed: <dev-lang/ruby-2.0
 
 Ruby MRI 1.9 has been retired by upstream in February 2015.[1]
 We remove Ruby MRI 1.9 support from the tree now. In parallel Ruby MRI 2.1 
diff --git a/metadata/news/2015-08-26-ruby-19-removal/2015-08-26-ruby-19-removal.en.txt.asc b/metadata/news/2015-08-26-ruby-19-removal/2015-08-26-ruby-19-removal.en.txt.asc
index 35a07d8201ba..8012c25398da 100644
--- a/metadata/news/2015-08-26-ruby-19-removal/2015-08-26-ruby-19-removal.en.txt.asc
+++ b/metadata/news/2015-08-26-ruby-19-removal/2015-08-26-ruby-19-removal.en.txt.asc
@@ -1,13 +1,32 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v2.0
 
-iQF8BAABCgBmBQJV4bFzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGNEQyNDdEMTRGNDc0OEQwQTMyQ0MxRjA3
-NEQ5Rjc0RUVBQzZBM0IxAAoJEHTZ907qxqOxW2kIALxg863MY7tk4W9VCPyhS6LH
-wwVKBT4nxemCnQANkhXvVn8cbvCVUB+mp9Tdt7mGFVFXjZuwEQovpem+ewr6Zqjp
-n/WSDihR5raAg87vq14NtXVhkuYlqTEO402GXE1CdBboJeJh7M1dEMPFcz7E8Hp+
-MdCKw6I9mCTrvRR9fwaWuch1oMeR3dNEYLHYyUUiA5hZXNRXEO1Eb05HsXs+P/po
-blyQqTLIEycJ7oNooZtVvqOOVrg/8j6teoZI2FOS138EwZGejySKy50ljWhbPST0
-p8DklsbtJGcxggnERYIMdAD06NG83OLahBcI6QRN2Jg4e+mcVFf9lJPyFutjfg8=
-=WCcY
------END PGP SIGNATURE-----
+owFtk3tMFEccx0/wxUp5GK0KEQel4oO9vTsEvBPUgwO9okJOUAwWs3c3d7e4t3uZ
+nb1HWqtoNZiUlmi0sRRblRLA4KPxERWJylUetW0akoYq+IivBI2tmkZNW9vZ9aw1
+df+bnd/vO5/vd35T/1a0hhox+ujjur7CffdHtEfX2VMNOn0WrZtPG7JpJNtDtN5I
+I+gV/SyvhYIWB/Gq3idsGYd5aAI2UgD0WiOIVCx48ceg1TEGrR44oYuVeUyZZewR
+kQksZwUZ8sDW1eGGCOR6kQzdi91QwKKoFZF7IVUgCpgs6bKQj6hjGMSMj2c5gSoV
+JQydJvAKjrJBPydxokB+UitgQKKtGHrpIhF5WWwiUDrKwkmkO0RbXbRVkDDL84pE
+rhP6aZ4V3Ixqj7BSlEq93GZVvXhYCdghFIgpzCHoBGRP9kkYQdYLOAEUQTuSWRRS
+YbSV+veo1fBFABC8JiTJPp+IMHAh0QuwBwIiAYEgBrTAKgAfixQi/lWPEhn1sinA
+8TzBAKwDc36WmFeOtrMSBD4kujgepkvAVp6/Zl2Z2baksGwl8LOIY+08VHAjwQOK
+9DhEoVoWiIooEFHs+e95Oi1FWV0gJMoIOGSESPZ8CEAJ8tChHKmWcuROkI+EQe6M
+k4CSmt6YAZQeBB2i1wsFJ6vKk10Ki8DhIelCwGFAFkq5QacFZqxG4BVJOX6NgdDy
+nB8iSS2wQwkDnyhJnOLl3zhEFyBp/Q9IUlJRYiVGCjzQsV7ViFgBEsSYE9zAz7Em
+ioqJ+FKRgOQRA0qPivqmJsL+GuUbRSCOGKQoMgjAg7FPMjFMIBDQqtOlzJky2gwU
+GIEMKaPMDKMzMIZMJmKNdoko8tJoI51Jk/GjSaLQyVDbo+wjNSMozbJRUcqjK5yw
+SUO+CZpZnCTJENEuH1osiFgNXzLmGPXZxmxLjiUzJ9tizik05mcX6bN0uux8fVHm
+fEuBeV6WWV9YoKFiEl6++JyWBM3hrPHl68Oxc4Z/2N8dzzSdcwxPW9R/N2qcecbl
+yq821wQbh8NNO2d/dvDAg4HqqjN5J85yXQkPHl+ZXN5e1kXv/e7zypqfpj8aSt2k
+u1EzNx7faVxg3Aufzuutx+aesxW0M7nj+r2lx01b4k/Hfs3X5m+tjctb9NfYoMc4
+km7tcEU3Nbg/XIuTj8VNr/qzb//grJ6od2/1hXc8uVXSb99go4tjYw4eTGkFGx8u
+THl/8Pg1d9L59oxRtfDSuiPm0+eHpjxvnn2sAJUWx92sr6yWN6TDK3sGBq6uyevb
+vXbZ5a5pu5i3J21N6o0xXOqnGyvSYk8Mbg4fDe76tr/ilzmdkifNsvOQ9dFsg1YM
+jC0e07bhYkbSsLNjx68lk2/XRO9L+aDn1NjxScHtwW12y6hQJ1x8QDdzU+bf52ak
+ThWq206ePPTzheTyi4nhpqT65RuncCXpngsD5v64T+uu7R0MHWntnBa4kVY3JiVu
+TcLA9y25pklZT8u/+IZp/n01XrUo1VyR8qxgztDgxBlHfrwZFy6e+vB8m3nLeOb+
+nTamd3pdwzvPEi9dXbL0VG7UyZmf+LovtvbcrqlabV0KD6cdbVg4dUL3x7XFX9If
+HQ4PXb5nvR5ODMvB1ESmds8tx4XO51Ty2YfNzc//GHdgYnJG1co9JbsDg1eOb+we
+3ZB5d27zb+t3Pc1b0AL0K86UNrb9Aw==
+=dwc1
+-----END PGP MESSAGE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8f951dff4efb..6f07b9cce47e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Feb 2016 15:53:14 +0000
+Tue, 23 Feb 2016 15:26:16 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2834a5dfc649..af01ed7b4823 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Feb 21 15:52:25 UTC 2016
+Tue Feb 23 15:25:27 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7117ce244881..b713f674e7f3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 21 Feb 2016 16:00:01 +0000
+Tue, 23 Feb 2016 15:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3f7fb9dd9a61..8d0a22fae91b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1456069801 Sun 21 Feb 2016 03:50:01 PM UTC
+1456241101 Tue 23 Feb 2016 03:25:01 PM UTC
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
index d9d31a7adc29..16645a58446d 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="selinux"
 
 DEPEND="
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
index fa2e1e330b9d..6eba5de3ef8e 100644
--- a/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="scp shadow static-libs"
 
diff --git a/net-dialup/moserial/moserial-3.0.10.ebuild b/net-dialup/moserial/moserial-3.0.10.ebuild
index d19babf50070..9c32ced20df2 100644
--- a/net-dialup/moserial/moserial-3.0.10.ebuild
+++ b/net-dialup/moserial/moserial-3.0.10.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/moserial"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index c41ce7a4bd12..3121a4b5b946 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,5 +1,2 @@
 DIST c-ares-1.10.0.tar.gz 809073 SHA256 3d701674615d1158e56a59aaede7891f2dde3da0f46a6d3c684e0ae70f52d3db SHA512 fef6945549034390ddaa03acf5509d0095e97c151e5f4047ffc32c51945a7261759228b20fdd77b9e4bf4a95f3a61bfb79bee0c66a860219debfd2916b390693 WHIRLPOOL 660d04b20371a75b4a9dea45449407b10c782ae8367356e2f6b0b73cb2d62485068a543b4a2303673f688c6c784afd9925faa18be943aa771d8467077f8ea407
-DIST c-ares-1.7.4.tar.gz 639365 SHA256 6b8a7c4ecd67240cca50a345bc955ffbe2d6d1f43982defc77a8e76031a6cb06 SHA512 e16703c158cebbdf8f1b8a83f47496d5c6450905a9f267aaf07c8968715a6f8746e30421eb1b6e877e99ddf82e93e6ce11bd8c4f1859913cf1f41abc69b47245 WHIRLPOOL fc719d15fcad0c0c3859da8ec8684a7331c61390be619a1e4dad386b5fb3ddb5eaf4e1ef6ec8a5fc2b0e11087e92c71024b9376cb75541e2fa66fa6867d5e792
-DIST c-ares-1.7.5.tar.gz 746032 SHA256 a6b6381e5a025ef942c76360989341ac5b0c82007e2979d40ded7d16396656a8 SHA512 121be9eaeb127f2648744d0b74d93ea80c02932082e42f08df42834aa0f9180e386cb26f85f1962d5388365770f7204510f5f22ed9b85ee01dbcf8009d9f74ce WHIRLPOOL 1faf9f740fbb6543e09447310b0f9a4f277312f7bdb9a261830b021052619f8f0b6ccfe0906c4cfe37323b87ef97e10665722158b7fca101c1043b1582f6df6f
-DIST c-ares-1.8.0.tar.gz 778926 SHA256 f4d9b3721966043645f3b953b40c0185483d597f743cb834456d85fa501d8f62 SHA512 972f21a8ee50268773f4b90be6380c405fcd11089c102068665615c8a9bd8f8b7726d53d45cea46a87b863983535afd412cdddae83083e9cbd036ed8a4e7b5fa WHIRLPOOL ad54c63eca4d62760d17135628319b4e77b6baafb6007a1e0538e9d0b8cddd25f7062fd68dd9149672adc24a917058d93990354db69176f6522571d75ee3e7ef
-DIST c-ares-1.9.1.tar.gz 782945 SHA256 023f28001f2f839645c8700187391a011198950c73ddd91510c7549d87373936 SHA512 896acd810912ae269d67904e0a2533faab855943444fffae45aa4c1633eefec72a59006cbdf5b8cc67788df6977ed72244e8d14bd6fff9e6d5670283d12be6d2 WHIRLPOOL d32efdce6ddafbb1e13f9203eb82ffdcb4d08737225bba0a4aeefa50f78717b21add847beb2f328f7516695f80dd983f687ff31bb0c56f75ee54819d0cd6f261
+DIST c-ares-1.11.0.tar.gz 1102531 SHA256 b3612e6617d9682928a1d50c1040de4db6519f977f0b25d40cf1b632900b3efd SHA512 0a3bbe95dbc80201a7024db564c057a788f252b09c4bcc1539d2db8b12f3497db66710e24b1c18132579ddbe3015f1d916b378b83f9c32deb5fba206ffaf9f27 WHIRLPOOL f70a4aff5e50eb46e356d09b3466021f0cd2eb93959bc4d752d7ff26415f1de387a123f0607f97d87d42f75f643094f7382205ff9ea84c00205a9291d0faa700
diff --git a/net-dns/c-ares/c-ares-1.10.0.ebuild b/net-dns/c-ares/c-ares-1.10.0.ebuild
deleted file mode 100644
index 7e7ddf5badee..000000000000
--- a/net-dns/c-ares/c-ares-1.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-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 ~x86-macos ~sparc64-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES NEWS README RELEASE-NOTES TODO )
-
-src_configure() {
-	econf \
-		--enable-nonblocking \
-		--enable-symbol-hiding \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}
diff --git a/net-dns/c-ares/c-ares-1.11.0.ebuild b/net-dns/c-ares/c-ares-1.11.0.ebuild
new file mode 100644
index 000000000000..374cbc8bbe49
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="http://c-ares.haxx.se/"
+SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+IUSE="static-libs"
+
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-nonblocking \
+		--enable-symbol-hiding \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+}
diff --git a/net-dns/c-ares/c-ares-1.7.4.ebuild b/net-dns/c-ares/c-ares-1.7.4.ebuild
deleted file mode 100644
index a3745ad9cdea..000000000000
--- a/net-dns/c-ares/c-ares-1.7.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_configure() {
-	econf --enable-shared --enable-nonblocking  --enable-symbol-hiding \
-		--enable-warnings
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc RELEASE-NOTES CHANGES NEWS README*
-}
diff --git a/net-dns/c-ares/c-ares-1.7.5.ebuild b/net-dns/c-ares/c-ares-1.7.5.ebuild
deleted file mode 100644
index 6e7fb3dfbebb..000000000000
--- a/net-dns/c-ares/c-ares-1.7.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-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 ~x86-macos ~sparc64-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES README README.cares RELEASE-NOTES TODO )
-
-src_configure() {
-	econf \
-		--enable-nonblocking \
-		--enable-symbol-hiding \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}
diff --git a/net-dns/c-ares/c-ares-1.8.0.ebuild b/net-dns/c-ares/c-ares-1.8.0.ebuild
deleted file mode 100644
index 6e7fb3dfbebb..000000000000
--- a/net-dns/c-ares/c-ares-1.8.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-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 ~x86-macos ~sparc64-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES README README.cares RELEASE-NOTES TODO )
-
-src_configure() {
-	econf \
-		--enable-nonblocking \
-		--enable-symbol-hiding \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}
diff --git a/net-dns/c-ares/c-ares-1.9.1.ebuild b/net-dns/c-ares/c-ares-1.9.1.ebuild
deleted file mode 100644
index 1c9d1e07ffcd..000000000000
--- a/net-dns/c-ares/c-ares-1.9.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS CHANGES NEWS README RELEASE-NOTES TODO )
-
-src_configure() {
-	econf \
-		--enable-nonblocking \
-		--enable-symbol-hiding \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index e1a8d0dc28c0..9b691c12b76c 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -2,5 +2,7 @@ DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e
 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
 DIST openafs-1.6.14-doc.tar.bz2 3530481 SHA256 544fb3370465881bd1aadb24cf9e40610ff23d8445759c659d5354ce1e9358c3 SHA512 35de279fd61c657f5cd1b5fa26113a667155c2f2733fffb9bafeec1ac6be548fa335e5039e783cd6031fbc0ab8d27dd576e4571d76dd3f403283d5b32f75ca50 WHIRLPOOL 0663663a365f20448641093b1fc086219d395a7603c1658b69c083657ae0a2fec3d16a44e48adc3a7669b4a89ea07f0ce8e91d80134c5a5a1a193f304ced4a0b
 DIST openafs-1.6.14-src.tar.bz2 14605615 SHA256 3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f SHA512 957178b1c3f6262e831ec497b7dd76e208a48f2107942d44ce72b062081e2932b93cb800b786eb88b770a647daf3585f659fdd1e715d0e724ac56eae011f3601 WHIRLPOOL 43e58a9e34ed2340c732b88261ecf4043f7a6e7db18bac7113b74455b1a2f1ed864d345bf41bac42d6d437ae18778e7f37a794b738a882c0fb5e36257af7d960
+DIST openafs-1.6.16-src.tar.bz2 14612920 SHA256 3431702bdcbd1b27833060c50869e618a192495877ebb0a66e4610de0b48eb81 SHA512 775c6b51e4a916ab14c2a33b746ffc67ce7f8e4d4d75e17374341d81b8d8b424971ffd67ba191848be28560cefceecc51f1f608ccdc7d896bafafa68e1726cb9 WHIRLPOOL 0da43210ee7779e49b86bb337bef5f3b70fdf3876eca763025d45628533a7ce7104b193c0c9d98d2f4363314faa79c7bd367432c5272c9b12249623f9b342812
 DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
 DIST openafs-patches-20150813.tar.xz 15520 SHA256 209766f5e97e924eab91d862875f360e0ed9821b317ee609789a77d7fbdeb8f0 SHA512 2703f65e7c3f1a724e9330d8f2aedf80f9d0b8ba4b03a5f466cd523eb8d0a1692542df722b24e06ce4ced476fb8615e2caca6159de7b18f151ecf7a14a5f0565 WHIRLPOOL c4055a7c0cf19847ecd8679316a0146b41589f157996b2f15b807d272270e65c1a6ee5f916d3127803cd26370c392b1e751d100d2ab383a57530b768e1682d60
+DIST openafs-patches-20160223.tar.xz 10536 SHA256 19c14ecd625ce96370fe3629faffd2841567954d687e1ee30c81a848702231a6 SHA512 83018a4ace8189182de7b878094c773996d824f9127f15167e1b5795e4b7af8f3cb3a86e054b95043343ff88c8b505376005cd97cc91b50e6bf05b2d5242ccbd WHIRLPOOL 8f58b30446fccf37df9460ff3ab87cbd2338346c545aca48bc328578951b92b3e34fe102ade2bcb822ddee5c826d9834d0c2ce257092aa9bdde4717afbbd756d
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild
new file mode 100644
index 000000000000..316d7c91e4d2
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools linux-mod multilib toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_PN="${PN/-kernel}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="20160223"
+
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
+ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support.  Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is ge 4 3 ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: <4.3"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Please do not file a bug report about this."
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	local myconf=""
+	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
+	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+		myconf="--enable-linux-d_splice_alias-extra-iput"
+	fi
+
+	local ARCH="$(tc-arch-kernel)"
+	local MY_ARCH="$(tc-arch)"
+	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+	if use kernel_linux; then
+		myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
+			--with-linux-kernel-build="${KV_OUT_DIR}"
+		)
+	elif use kernel_FreeBSD; then
+		myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
+	fi
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
+}
+
+src_install() {
+	if use kernel_linux; then
+		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
+
+		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
+
+		linux-mod_src_install
+	elif use kernel_FreeBSD; then
+		insinto /boot/modules
+		doins "${S}"/src/libafs/MODLOAD/libafs.ko
+	fi
+}
+
+pkg_postinst() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postrm
+}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index e1a8d0dc28c0..4f15a9971f8a 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -2,5 +2,8 @@ DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e
 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
 DIST openafs-1.6.14-doc.tar.bz2 3530481 SHA256 544fb3370465881bd1aadb24cf9e40610ff23d8445759c659d5354ce1e9358c3 SHA512 35de279fd61c657f5cd1b5fa26113a667155c2f2733fffb9bafeec1ac6be548fa335e5039e783cd6031fbc0ab8d27dd576e4571d76dd3f403283d5b32f75ca50 WHIRLPOOL 0663663a365f20448641093b1fc086219d395a7603c1658b69c083657ae0a2fec3d16a44e48adc3a7669b4a89ea07f0ce8e91d80134c5a5a1a193f304ced4a0b
 DIST openafs-1.6.14-src.tar.bz2 14605615 SHA256 3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f SHA512 957178b1c3f6262e831ec497b7dd76e208a48f2107942d44ce72b062081e2932b93cb800b786eb88b770a647daf3585f659fdd1e715d0e724ac56eae011f3601 WHIRLPOOL 43e58a9e34ed2340c732b88261ecf4043f7a6e7db18bac7113b74455b1a2f1ed864d345bf41bac42d6d437ae18778e7f37a794b738a882c0fb5e36257af7d960
+DIST openafs-1.6.16-doc.tar.bz2 3533244 SHA256 4916a5e155a4419186dd166e5eff4f30881399e81a255f7d3f43942a0b5bbcba SHA512 0a193fd24a11bb06621378e7c54feca8dc835b191f0c921c6fa6deb3d43be140ab4854f01128d29c76a075a705e88178128c94e9483162f4ba8c5e7ce4a06606 WHIRLPOOL 0be7495c40ef614d8198606afa297828fbb3fbdb063598dbb6d58e95375e9b1a49c4d6ab793f3581520bd27c655da158d3efb1602dfbaa8bca0bfadc5c94ab35
+DIST openafs-1.6.16-src.tar.bz2 14612920 SHA256 3431702bdcbd1b27833060c50869e618a192495877ebb0a66e4610de0b48eb81 SHA512 775c6b51e4a916ab14c2a33b746ffc67ce7f8e4d4d75e17374341d81b8d8b424971ffd67ba191848be28560cefceecc51f1f608ccdc7d896bafafa68e1726cb9 WHIRLPOOL 0da43210ee7779e49b86bb337bef5f3b70fdf3876eca763025d45628533a7ce7104b193c0c9d98d2f4363314faa79c7bd367432c5272c9b12249623f9b342812
 DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
 DIST openafs-patches-20150813.tar.xz 15520 SHA256 209766f5e97e924eab91d862875f360e0ed9821b317ee609789a77d7fbdeb8f0 SHA512 2703f65e7c3f1a724e9330d8f2aedf80f9d0b8ba4b03a5f466cd523eb8d0a1692542df722b24e06ce4ced476fb8615e2caca6159de7b18f151ecf7a14a5f0565 WHIRLPOOL c4055a7c0cf19847ecd8679316a0146b41589f157996b2f15b807d272270e65c1a6ee5f916d3127803cd26370c392b1e751d100d2ab383a57530b768e1682d60
+DIST openafs-patches-20160223.tar.xz 10536 SHA256 19c14ecd625ce96370fe3629faffd2841567954d687e1ee30c81a848702231a6 SHA512 83018a4ace8189182de7b878094c773996d824f9127f15167e1b5795e4b7af8f3cb3a86e054b95043343ff88c8b505376005cd97cc91b50e6bf05b2d5242ccbd WHIRLPOOL 8f58b30446fccf37df9460ff3ab87cbd2338346c545aca48bc328578951b92b3e34fe102ade2bcb822ddee5c826d9834d0c2ce257092aa9bdde4717afbbd756d
diff --git a/net-fs/openafs/openafs-1.6.16.ebuild b/net-fs/openafs/openafs-1.6.16.ebuild
new file mode 100644
index 000000000000..429eecbc9e43
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.16.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+PVER="20160223"
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="http://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
+
+IUSE="doc kerberos +modules pam"
+
+CDEPEND="
+	sys-libs/ncurses:0=
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+RDEPEND="${CDEPEND}
+	modules? ( ~net-fs/openafs-kernel-${PV} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+src_prepare() {
+	default
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	AFS_SYSKVERS=26 \
+	econf \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		--enable-supergroups \
+		$(use_enable pam) \
+		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
+		$(use_with kerberos krb5)
+}
+
+src_compile() {
+	emake all_nolibafs
+	local d
+	if use doc; then
+		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+			emake -C "${d}" html;
+		done
+	fi
+}
+
+src_install() {
+	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use pam && doman src/pam/pam_afs.5
+	DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
+			src/afsd/CellServDB NEWS README )
+
+	# documentation package
+	if use doc ; then
+		DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
+		dohtml -r doc/xml/
+	fi
+
+	einstalldocs
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+
+	# used directories: client
+	keepdir /etc/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
+}
diff --git a/net-irc/polari/polari-3.18.1.ebuild b/net-irc/polari/polari-3.18.1.ebuild
index 8ba3d367660b..5e5219230e44 100644
--- a/net-irc/polari/polari-3.18.1.ebuild
+++ b/net-irc/polari/polari-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/net-libs/glib-networking/glib-networking-2.46.1.ebuild b/net-libs/glib-networking/glib-networking-2.46.1.ebuild
index 6f1fc6db4329..241ca65d4530 100644
--- a/net-libs/glib-networking/glib-networking-2.46.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.46.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2+"
 SLOT="0"
 IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild
index 96e2dc18ce7c..8618e7745d99 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 LICENSE="LGPL-2+"
 SLOT="0/1"
 IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # pango used in goaeditablelabel
 # libsoup used in goaoauthprovider
diff --git a/net-libs/gssdp/gssdp-0.14.14.ebuild b/net-libs/gssdp/gssdp-0.14.14.ebuild
index 5cdb35137672..4259c9010702 100644
--- a/net-libs/gssdp/gssdp-0.14.14.ebuild
+++ b/net-libs/gssdp/gssdp-0.14.14.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="+introspection +gtk"
 
 RDEPEND="
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild
index fa953a449d0c..3c8994d8c4e1 100644
--- a/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild
+++ b/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/2" # subslot: soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/gupnp/gupnp-0.20.16.ebuild b/net-libs/gupnp/gupnp-0.20.16.ebuild
index 3fa8639effaa..314f2612ae2c 100644
--- a/net-libs/gupnp/gupnp-0.20.16.ebuild
+++ b/net-libs/gupnp/gupnp-0.20.16.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="connman +introspection kernel_linux networkmanager"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
new file mode 100644
index 000000000000..df35f0973ecc
--- /dev/null
+++ b/net-libs/librsync/files/librsync-0.9.7-fix-testsuite.patch
@@ -0,0 +1,15 @@
+Description: Fix running tests with the parallel harness
+Author: Andrey Rahmatullin <wrar@wrar.name>
+Last-Update: 2013-06-26
+
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -29,7 +29,7 @@ isprefix_driver_LDADD = ../isprefix.o # XXX: should link replaced functions
+ # failed.  Generally these tests should be ordered so that more basic
+  # tests are run first.
+   
+   -TESTS_ENVIRONMENT = $(SH) $(srcdir)/driver.sh
+   +TEST_LOG_COMPILER = $(SH) $(srcdir)/driver.sh
+    
+     TESTS = \
+      	signature.test mutate.test sources.test isprefix.test	\
diff --git a/net-libs/librsync/librsync-0.9.7-r3.ebuild b/net-libs/librsync/librsync-0.9.7-r3.ebuild
index 704e50c4b14e..b365d5525304 100644
--- a/net-libs/librsync/librsync-0.9.7-r3.ebuild
+++ b/net-libs/librsync/librsync-0.9.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,6 +25,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-getopt.patch
 	"${FILESDIR}"/${P}-implicit-declaration.patch
+	"${FILESDIR}"/${P}-fix-testsuite.ebuild
 	)
 
 src_prepare() {
diff --git a/net-libs/librsync/librsync-2.0.0.ebuild b/net-libs/librsync/librsync-2.0.0.ebuild
index d65747c8bf84..c0b90a7b71c6 100644
--- a/net-libs/librsync/librsync-2.0.0.ebuild
+++ b/net-libs/librsync/librsync-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
index 32d532addd0f..9adfcf564dfd 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI//-gnome}"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.52.2.ebuild b/net-libs/libsoup/libsoup-2.52.2.ebuild
index cfe6dec51362..8fe0dcd1d5af 100644
--- a/net-libs/libsoup/libsoup-2.52.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.52.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
 LICENSE="LGPL-2+"
 SLOT="2.4"
 IUSE="+introspection samba ssl test vala"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 REQUIRED_IUSE="vala? ( introspection )"
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
index 749979fc8d93..3a80ece829e8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
 # seccomp
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index ca7395023554..c3600c249ca4 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,2 +1,4 @@
 DIST chrome-remote-desktop_47.0.2526.18_amd64.deb 16611922 SHA256 311bd33e434fae2cb0471a9a494f875faab551d53c769140b5a9715d239a68dd SHA512 3503a1471f6f2236951832035c97d18d64917bf374ca01edf93ae652ea10572a8d84d63a8b7a970a5ea37c67c8b24d3a2563db61e2aaeeedc94a5a06936dbb3c WHIRLPOOL bcd24c053c04f7fe352b346d63238783d6cc5b5f205a66bd066fe477371e7558322f846452ac03f89260bc536a8ed49c1d56988b5b14c62ab4ebef36033f1c00
 DIST chrome-remote-desktop_47.0.2526.18_i386.deb 17153928 SHA256 3de83736447f20193d85733d15617befa1adb7a70c0b17c0dd46bcc31b7af414 SHA512 ec03a967c49f092593ec46c8dbf1a72ce7d5b2e63dbaa6d0ea9ea1c0e47ebcbc2aa130ba3135ac6559e3d55b14e77f17568cb72181c86d30f7b64b5666d4c8d6 WHIRLPOOL 032c43af5447bab5a790bf6cb78627573caafceb31de84a3e5024ef25239fb9eb44d44746f1a64d3bc92221cd0c0662b0d511beb8ce538ad162954e9a29456f8
+DIST chrome-remote-desktop_49.0.2623.40_amd64.deb 20315570 SHA256 2f3cb883e1ff2465db47d5aadf773efb49c5f11b0bfe3dfba973608e4db45047 SHA512 d936885a986a749a0b4ebb1bb68fe0bc14d10d21363a409abbbb224b4f3ee048ef030ee81469be9bbb8c3852d7c6793fcab1f51d52fcaf5b02cda07550b72330 WHIRLPOOL 6662bfc8a8c298b7c062e4a10752aa3dfe910c7602a0bc20dc64533195d61ceb414dbc411c7f872e085dd13c46372ee46b33904d68bb5aae13698a04442e3905
+DIST chrome-remote-desktop_49.0.2623.40_i386.deb 20941574 SHA256 00e480a90b3ed3545ea762d7501b323f2471eb06b11f87882c046598b8f38df7 SHA512 00cf6641ee993fb8c295ca99cb57cde42eb3dd6cc34ae4684f858279615695d5b1a257081e8988293f94e887986492e112bc0276f572cd592d9879dec88eace8 WHIRLPOOL effd2650ee7d5b97f87ede0ac79bc1818ddc06e3eb742a080b12a4ef67283f5ba20495d5a5b4f5a5923d2a9a574a711513344b08abac3938ad142f27af48ed88
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-47.0.2526.18.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-47.0.2526.18.ebuild
index b244ef808554..ea1c036bbc64 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-47.0.2526.18.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-47.0.2526.18.ebuild
@@ -29,7 +29,7 @@ SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
 
 LICENSE="google-chrome"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 # All the libs this package links against.
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild
new file mode 100644
index 000000000000..b244ef808554
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit unpacker eutils python-single-r1
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop"
+HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
+	x86? ( ${BASE_URI}_i386.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+# All the libs this package links against.
+RDEPEND="app-admin/sudo
+	${PYTHON_DEPS}
+	>=dev-libs/expat-2
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-python/psutil
+	gnome-base/gconf:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/pam
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/pango"
+# Settings we just need at runtime.
+RDEPEND+="
+	x11-base/xorg-server[xvfb]"
+DEPEND=""
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
+}
+
+src_install() {
+	insinto /etc
+	doins -r etc/opt
+
+	insinto /opt
+	doins -r opt/google
+	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+
+	dodir /etc/pam.d
+	dosym system-remote-login /etc/pam.d/${PN}
+
+	dodoc usr/share/doc/${PN}/changelog*
+
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Two ways to launch the server:"
+		elog "(1) access an existing desktop"
+		elog "    (a) install the Chrome plugin on the server & client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) on the server, run the Chrome plugin & enable remote access"
+		elog "    (c) on the client, connect to the server"
+		elog "(2) headless system"
+		elog "    (a) install the Chrome plugin on the client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
+		elog "    (c) run the command mentioned on the server"
+		elog "    (d) on the client, connect to the server"
+		elog
+		elog "Configuration settings you might want to be aware of:"
+		elog "  ~/.${PN}-session - shell script to start your session"
+		elog "  /etc/init.d/${PN} - script to auto-restart server"
+	fi
+}
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild
index 1822c2960fe4..d9fbf9aaf9ad 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="flickr"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
index 5637df30a246..6b1b31ea1c6c 100644
--- a/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
+++ b/net-misc/gupnp-tools/gupnp-tools-0.8.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild
index 0bd1b89c4017..0508d152835c 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.0.8-r1.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.0.8-r1.ebuild
index 1f294d639946..4a77f2726181 100644
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.0.8-r1.ebuild
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-1.0.8-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
index 784318f73e57..a66b8445582d 100644
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild
index d7a3f60d48e6..d653cc35f606 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk test"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild
index 0c4c40b78b15..142b77f2b136 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild
index a1f6ee2de5c7..71d980b47ab8 100644
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="gtk test"
 
 RDEPEND="
diff --git a/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild
index e8d71e396efc..e64e1994482e 100644
--- a/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.0.10-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspec
 kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
 vala +wext +wifi zeroconf" # wimax
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
diff --git a/net-misc/rygel/rygel-0.28.2-r1.ebuild b/net-misc/rygel/rygel-0.28.2-r1.ebuild
index 54a4b2209581..ff237a34c2f0 100644
--- a/net-misc/rygel/rygel-0.28.2-r1.ebuild
+++ b/net-misc/rygel/rygel-0.28.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X +introspection +sqlite tracker test transcode"
 
 # The deps for tracker? and transcode? are just the earliest available
diff --git a/net-misc/vinagre/vinagre-3.18.2.ebuild b/net-misc/vinagre/vinagre-3.18.2.ebuild
index 960bfcd02d42..98a20b69536f 100644
--- a/net-misc/vinagre/vinagre-3.18.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="rdp +ssh spice +telepathy zeroconf"
 
 # cairo used in vinagre-tab
diff --git a/net-misc/vino/vino-3.18.1.ebuild b/net-misc/vino/vino-3.18.1.ebuild
index bee9b3a4915d..0d88f3691d0f 100644
--- a/net-misc/vino/vino-3.18.1.ebuild
+++ b/net-misc/vino/vino-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
index 23f205bff97a..beaa57180cc2 100644
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 # Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
diff --git a/net-voip/vidyodesktop/Manifest b/net-voip/vidyodesktop/Manifest
index c4cd5bf5e246..809b8e2494e4 100644
--- a/net-voip/vidyodesktop/Manifest
+++ b/net-voip/vidyodesktop/Manifest
@@ -1,4 +1,6 @@
 DIST VidyoDesktopInstaller-ubuntu-TAG_VD_3_3_0_027.deb 8956880 SHA256 e8461c384d5dc95c705414b1746cc52abb43b7ca933fc850bd02b3313d79cb35 SHA512 2a0cda8e6638da161d0d5a8591025849720763648f87387c887c9962dbc4d47b86ff7634d0e382bdd68d4744a113e4941a9bcbf40908f99826bbfac5ad85ba7f WHIRLPOOL dd74e290d4eb1d70c7b4d23cf3fe895c8f17c34455bdaf413bb26a3b583c7343603d99c200794ce8bf33ea7a19f017078a3e4cfb7fe28a895d035ceb83c32745
 DIST VidyoDesktopInstaller-ubuntu-TAG_VD_3_3_0_127.deb 8956874 SHA256 6d4c6f3b6abcde2c569b2589ab384ee1dc42d5d7448e15f2e4ed04bfa18b0a0d SHA512 e2931f3a04547dd2155da576de58cd398527e4cd3e4ef67fbcbf3916264bdd93dbad3b8eb815f90c495a1472bbc4c5a95a07f5026ddddddf714e8061da14503a WHIRLPOOL 8f37cbb33fb359909ce7ddc315c73bc0154bf4521556396b16ac73d41d6de65d93c79ca442649f19322251a440823b6c101342c7c194b81524bf5fa5c5e2ae0d
+DIST VidyoDesktopInstaller-ubuntu-TAG_VD_3_5_4_010.deb 9935926 SHA256 a707d8c83650a044570b263f283631ce6ebb404b53a4685a2f91f683fda0b502 SHA512 20268771818b1d64250cf45deeb0ad135ac89c27ebb063c2aafe1860ede1f5e3f9b828c17410a466b565288fdf43ebf71aa758ef31dab06ef910f320c5c5dac1 WHIRLPOOL 94d7797467d7c20a2b91bd93b8fe0a62639fe64e32188d4ca19f383b949727689a4858a79f4a1c480d8f115e056814d6802b5e0fae142af324a012c921c30776
 DIST VidyoDesktopInstaller-ubuntu64-TAG_VD_3_3_0_027.deb 9440382 SHA256 ac19b3995d31274e33d9b72db665cb86b475e07028c1ba0aa9ece220c84fae10 SHA512 30923904e74aabfefdad0c0cebfa956559e605830f417bc4dfc9ab5f7f50d029f6fe70a3f81f04e3418e7f0f4d3f4d885f1ce50fb0fc416b22061c4512a16a73 WHIRLPOOL 4351021f8e1aa1c6eb6529c33a3f1e62e697ed5b2bc9245d340686661633a0dd3556542087dbf777a707266f253f2d2689d7f1f665b98adc2eb04b6376af9401
 DIST VidyoDesktopInstaller-ubuntu64-TAG_VD_3_3_0_127.deb 9440364 SHA256 b8bd260d46557cad78a9392efd9b7f975a53adf6fb9ccc165c38c233405def1a SHA512 bed7e221a910432246b40bd73d157e3e44ab89ec4263d54b86422320c1d7ef01de2931958c1dc94ad489f2aeb9cef295eb29ebeeb8ac7ee885e0ac861f477d08 WHIRLPOOL 52e757ad8de37dd934e0739ea6b59454e769ee3d89ec8c41093c90e8f69cfe0097d530dc6c8aed4427bd2ab2ebfba3f389408e606ee2885f77669dc267f3596f
+DIST VidyoDesktopInstaller-ubuntu64-TAG_VD_3_5_4_010.deb 10393194 SHA256 9c5ab8293b6888336bc8d7a6d8b6d097f40efd201966c18cfd983f8adf58627c SHA512 82db8acbbf7c99a8fb4e4cb967c059a51936e893b05a9001ceb3461b39bb93dafd0a46c2281720d533114b183289afce14254bae2fca260965ca2957d9a46dce WHIRLPOOL 3339298fb91536bafb10610cb3898a68e560c7b38d2951e3dd6166b8ef6d91ee97e728189cdc3d15992ea95d73f7c355defd5439da9a913d7bf00c2b4bc81744
diff --git a/net-voip/vidyodesktop/vidyodesktop-3.5.4.010.ebuild b/net-voip/vidyodesktop/vidyodesktop-3.5.4.010.ebuild
new file mode 100644
index 000000000000..0a811d7a3126
--- /dev/null
+++ b/net-voip/vidyodesktop/vidyodesktop-3.5.4.010.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator unpacker
+
+DESCRIPTION="Enterprise video conferencing platform"
+HOMEPAGE="http://www.vidyo.com/"
+SRC_URI="
+	amd64? ( https://demo.vidyo.com/upload/VidyoDesktopInstaller-ubuntu64-TAG_VD_$(replace_all_version_separators _).deb )
+	x86?   ( https://demo.vidyo.com/upload/VidyoDesktopInstaller-ubuntu-TAG_VD_$(replace_all_version_separators _).deb )
+"
+
+LICENSE="Vidyo-EULA"
+SLOT="0"
+RESTRICT="mirror strip"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	/opt/vidyo/VidyoDesktop/RenderCheck
+	/opt/vidyo/VidyoDesktop/VidyoDesktopInstallHelper
+	/opt/vidyo/VidyoDesktop/VidyoDesktop
+"
+
+DEPEND=""
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/libffi
+	sys-apps/util-linux
+	sys-libs/glibc
+	sys-devel/gcc
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glu
+	media-libs/libpng
+	media-libs/mesa
+	net-dns/libidn
+	sys-libs/zlib
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+"
+
+src_install() {
+	cp -a opt "${D}"
+	doicon usr/share/pixmaps/vidyo_icon.png
+	dodoc opt/vidyo/VidyoDesktop/license.txt
+	rm "${D}opt/vidyo/VidyoDesktop/license.txt"
+	exeinto /opt/bin
+	doexe usr/bin/VidyoDesktop
+	make_desktop_entry VidyoDesktop VidyoDesktop vidyo_icon 'AudioVideo;Network;'
+}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
index e4819fdf8013..1e38413c5954 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2/13" # subslot = libgnome-bluetooth soname version
 IUSE="+introspection"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index fdeefa480bb2..80bf7d52a50f 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -2,6 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Tobias Klausmann <klausman@gentoo.org> 04 Feb 2016
 # sys-cluster/ceph is not broken per se, but a maintenance burden.
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index d939613ef647..00d84c22e8dc 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
 # James Le Cuirot <chewi@gentoo.org) (30 Jan 2016)
 # scrollview requires SWT, which is currently unsupported on ARM.
 app-text/tesseract scrollview
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index a69a3ed8633e..fbb652ec815a 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,12 +4,20 @@
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Jeroen Roovers <jer@gentoo.org> (16 Aug 2015)
 # Bundles luajit which has not been ported to HPPA (bug #554376)
 app-text/texlive-core luajittex
 dev-texlive/texlive-basic luajittex
 
-# Jeroen Roovers <jer@gentoo.org> (3 Jul 2015) 
+# Jeroen Roovers <jer@gentoo.org> (3 Jul 2015)
 # net-libs/nghttp2 fails to compile (bug #552898)
 net-libs/nghttp2 cxx
 
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 2da16cb4e9f3..6eba8fc962ca 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -2,6 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Pacho Ramos <pacho@gentoo.org> (31 Jan 2016)
 # Missing keywords, bug #560382
 media-video/ffmpeg snappy
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 6d9c43cbba4a..d1b47b673518 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Mike Frysinger <vapier@gentoo.org> 21 Feb 2016
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Mike Frysinger <vapier@gentoo.org> (17 Dec 2015)
 # The tlsdate seccomp logic is open-coded and doesn't support this arch yet.
 net-misc/tlsdate seccomp
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 9e3794071d2f..3b78200ca32f 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -2,6 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Patrick Lauer (20 Feb 2015)
 # Missing keywords on deps
 net-libs/ortp zrtp
diff --git a/profiles/arch/sh/package.use.mask b/profiles/arch/sh/package.use.mask
index 25415b690aff..1a55dbcbb0bb 100644
--- a/profiles/arch/sh/package.use.mask
+++ b/profiles/arch/sh/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Mike Frysinger <vapier@gentoo.org> 21 Feb 2016
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Sergey Popov <pinkbyte@gentoo.org> (24 Oct 2015)
 # Not tested
 net-mail/dovecot lz4
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 52aa1c35aaf7..d0bf6deed29b 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -2,6 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Justin Lecher <jlec@gentoo.org> (22 Feb 2016)
+# Missing test deps keyword #575366
+dev-cpp/eigen test
+
+# Mike Frysinger <vapier@gentoo.org> (21 Feb 2016)
+# Needs arch love for elementary. #575322
+media-libs/elementary javascript
+
 # Pacho Ramos <pacho@gentoo.org> (20 Feb 2016)
 # Missing keywords, bug #551580
 app-office/planner eds
diff --git a/profiles/package.mask b/profiles/package.mask
index a6c3be776a1d..8255604d9bf5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Patrick Lauer <patrick@gentoo.org> (22 Feb 2016)
+# Inactive upstream, build failures, obsoleted by rakudo/perl6
+dev-lang/niecza
+dev-lang/niecza-bin
+
+# Eray Aslan <eras@gentoo.org> (22 Feb 2016)
+# Mask experimental software
+=mail-mta/postfix-3.2*
+
+# James Le Cuirot <chewi@gentoo.org> (21 Feb 2016)
+# No revdeps, no release since 2007, and upstream have even moved the
+# download to a hidden OldFiles directory in the parent SourceForge
+# project. Removal in 30 days.
+dev-java/xsd2jibx
+
 # James Le Cuirot <chewi@gentoo.org> (19 Feb 2016)
 # Upstream EOL is December 2016. We would rather focus on other things
 # than support it until then. Removal in 30 days.
@@ -264,18 +279,6 @@ www-apps/389-dsgw
 # Mask this liferea version because upstream released it broken
 =net-news/liferea-1.10.17
 
-# Justin Lecher <jlec@gentoo.org> (29 Dec 2015)
-# Fails to build and test runs
-# No reverse deps
-# #370021, #478614, #513964
-sci-libs/libbufr
-
-# Manuel Rüger <mrueg@rueg.eu> (24 Dec 2015)
-# Effectively unmaintained, multiple bugs
-# Bug 288611,358013,413987,468186,480854,528750,548480,566226
-# Masked for removal in 30 days.
-media-tv/xawtv
-
 # Fabian Groffen <grobian@gentoo.org> (11 Dec 2015)
 # Release candidates for Exim 4.87
 =mail-mta/exim-4.87_rc2
@@ -300,11 +303,6 @@ media-tv/xawtv
 dev-lang/php:5.4
 ~virtual/httpd-php-5.4
 
-# Justin Lecher <jlec@gentoo.org> (12 Nov 2015)
-# deprecated version of the plugin. 
-# sci-chemistry/pymol includes the newer version
-sci-chemistry/pymol-apbs-plugin
-
 # Brian Evans <grknight@gentoo.org> (11 Nov 2015)
 # Mask latest xdebug{,-client} beta versions
 # Upstream keeps changing the tarballs causing Manifest errors.
@@ -312,17 +310,6 @@ sci-chemistry/pymol-apbs-plugin
 >=dev-php/xdebug-2.4.0_beta1
 >=dev-php/xdebug-client-2.4.0_beta1
 
-# Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
-# Vulnerable package CVE-2014-{1932,1933}
-# Bug: 507982
-dev-python/imaging
-
-# Justin Lecher <jlec@gentoo.org> (10 Nov 2015)
-# Compatibility virtual for transition from
-# dev-python/imaging to dev-python/pillow
-# obsolete now #508266
-virtual/python-imaging
-
 # Michał Górny <mgorny@gentoo.org> (30 Oct 2015)
 # Uses unsafe ioctls that could result in data corruption. Upstream
 # is working on replacing them in the wip/dedup-syscall branch.
diff --git a/profiles/prefix/linux/profile.bashrc b/profiles/prefix/linux/profile.bashrc
index 4e9218257749..9a4890117525 100644
--- a/profiles/prefix/linux/profile.bashrc
+++ b/profiles/prefix/linux/profile.bashrc
@@ -3,10 +3,29 @@
 #
 # # Remember, bash treats floats like strings..
 
+get_libc_vers_min() {
+	if [[ -x /usr/bin/ldd ]] ; then
+		/usr/bin/ldd --version \
+			| head -n1 \
+			| grep -o ") 2\.[0-9]\+" \
+			| cut -d. -f2
+		return
+	elif [[ -x /lib/libc.so.6 || -x /lib64/libc.so.6 ]] ; then
+		{
+			/lib/libc.so.6 || /lib64/libc.so.6
+		} 2>/dev/null \
+			| head -n1 \
+			| grep -o 'version 2\.[0-9]\+' \
+			| cut -d. -f2
+		return
+	fi
+	echo "0"
+}
+
 if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == unpack ]]; then
     # Since 2.3 > 2.12 in numerical terms, just compare 2.X to 2.Y, will break
     # if >=3.0 is ever released
-    VERS=$(/usr/bin/ldd --version | head -n1 | grep -o ") [0-9]\.[0-9]\+" | cut -d. -f2 )
+    VERS=$(get_libc_vers_min)
     if [[ $VERS -lt 12 ]]; then # compare host glibc 2.x to 2.12
         ewarn "Your host glibc is too old; disabling automatic fortify. bug 289757"
         EPATCH_EXCLUDE+=" 10_all_gcc-default-fortify-source.patch" # <=gcc-4.5*
@@ -15,11 +34,11 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == unpack ]]; then
 fi
 
 if [[ ${EBUILD_PHASE} == setup ]]; then
-    VERS=$(/usr/bin/ldd --version | head -n1 | grep -o ") [0-9]\.[0-9]\+" | cut -d. -f2 )
+    VERS=$(get_libc_vers_min)
     if [[ $VERS -lt 6 && "${CFLAGS} " != *'gnu89-inline '* ]]; then # compare host glibc 2.x to 2.6
         einfo "Your host glibc is too old; enabling -fgnu89-inline compiler flag. bug 473524"
         CFLAGS="${CFLAGS} -fgnu89-inline" # for C only
     fi  
 fi
 
-# vim: set syn=sh expandtab ts=4:
+# vim: set syn=sh:
diff --git a/profiles/prefix/sunos/solaris/package.use.mask b/profiles/prefix/sunos/solaris/package.use.mask
index e2d19911340f..96305d86126f 100644
--- a/profiles/prefix/sunos/solaris/package.use.mask
+++ b/profiles/prefix/sunos/solaris/package.use.mask
@@ -3,6 +3,11 @@
 # $Id$
 
 
+# Fabian Groffen <grobian@gentoo.org> (23 Feb 2016)
+# luajit doesn't compile due to relocation problems
+~app-text/texlive-core-2015 luajittex
+~dev-texlive/texlive-basic-2015 luajittex
+
 # Fabian Groffen <grobian@gentoo.org> (16 Jan 2016)
 # GNU attr isn't supported
 dev-libs/glib xattr
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index d4f252eebe99..659fe80da8cd 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -12,3 +12,5 @@ slotmove >=sci-libs/libint-2 0 2
 move dev-ml/pa_test dev-ml/ppx_assert
 move dev-ml/custom_printf dev-ml/ppx_custom_printf
 move sci-mathematics/csdp sci-libs/coinor-csdp
+move dev-perl/ImageInfo dev-perl/Image-Info
+move dev-perl/ImageSize dev-perl/Image-Size
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index be9ee0cc67ec..e023def65e0a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -660,6 +660,7 @@ app-emulation/qemu:xen - Enables support for Xen backends
 app-emulation/qemu:xfs - Support xfsctl() notification and syncing for XFS backed virtual disks.
 app-emulation/rkt:actool - Install the actool for ACI manipulation
 app-emulation/rkt:rkt_stage1_coreos - Download and use a prebuilt stage1.aci from CoreOS
+app-emulation/rkt:rkt_stage1_fly - Build stage1-fly.aci
 app-emulation/rkt:rkt_stage1_host - Assemble stage1.aci from host binaries
 app-emulation/rkt:rkt_stage1_src - Build the stage1.aci from source
 app-emulation/spice:smartcard - Enable smartcard remoting using app-emulation/libcacard
@@ -2029,6 +2030,8 @@ dev-libs/libnfc:pcsc-lite - Enable NFC drivers that require pcsc-lite
 dev-libs/libnl:doc - Install development documentation
 dev-libs/libnl:python - Install experimental dev-lang/python bindings
 dev-libs/libnl:utils - Install command line interface utils
+dev-libs/liborcus:spreadsheet-model - Enable the spreadsheet model implementation
+dev-libs/liborcus:tools - Build miscellaneous tools
 dev-libs/libowfat:diet - Compile against dev-libs/dietlibc
 dev-libs/libp11:doc - Generate and install API documentation for the package.
 dev-libs/libpcre:bzip2 - Add support for pcregrep command to search within bzip2-compressed files (via app-arch/bzip2).
@@ -2181,6 +2184,7 @@ dev-ml/ocaml-uri:allservices - Compile support for all service types
 dev-ml/ocamlnet:cryptokit - Enables encryption support via dev-ml/cryptokit
 dev-ml/ocamlnet:httpd - Enables net-httpd web server component
 dev-ml/ocamlnet:zip - Enables netzip support to read/write gzip data using object channels
+dev-ml/pgocaml:camlp4 - Enable PG'Ocaml syntax extension.
 dev-ml/qcheck:ounit - Enable integration with ounit
 dev-ml/utop:camlp4 - Enables camlp4 support.
 dev-ml/uutf:utftrip - Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.
@@ -2402,6 +2406,7 @@ dev-python/spyder:numpy - Add support for dev-python/numpy
 dev-python/spyder:pep8 - Add support for dev-python/pep8
 dev-python/spyder:pyflakes - Add support for dev-python/pyflakes
 dev-python/spyder:pylint - Add support for dev-python/pylint
+dev-python/spyder:qtconsole - Add support for dev-python/qtconsole
 dev-python/spyder:rope - Add support for dev-python/rope
 dev-python/spyder:scipy - Add support for sci-libs/scipy
 dev-python/spyder:sphinx - Add support for dev-python/sphinx
@@ -2699,6 +2704,7 @@ dev-util/kdevplatform:konsole - Enable kde-apps/konsole integration
 dev-util/kdevplatform:reviewboard - Enable reviewboard support
 dev-util/ltrace:unwind - Use sys-libs/libunwind for frame unwinding support
 dev-util/lttng-tools:ust - Support LTTng-UST (Userspace Tracing)
+dev-util/mdds:valgrind - Add support for memory debugging using dev-util/valgrind
 dev-util/metro:ccache - Enable support for ccache
 dev-util/metro:git - Enable support for git snapshots
 dev-util/metro:threads - Enable support for pbzip2 tarball packing/unpacking
@@ -3035,6 +3041,8 @@ games-rpg/eternal-lands-data:music - Adds in-game music.
 games-rpg/eternal-lands-data:sound - Adds in-game sound effects.
 games-rpg/grimrock:bundled-libs - Use bundled libraries.
 games-rpg/kqlives:cheats - Enable cheating mode
+games-rpg/manaplus:mumble - Enable support for voice chat
+games-rpg/manaplus:pugixml - Use dev-libs/pugixml for XML parsing isntead of dev-libs/libxml2
 games-rpg/nwn:hou - Install the Hordes of the Underdark expansion pack
 games-rpg/nwn:sou - Installs the Shadows of Undrentide expension pack
 games-rpg/nwn-data:hou - Install the Hordes of the Underdark expansion pack
@@ -3646,6 +3654,7 @@ mate-base/mate:themes - Install MATE Desktop's themes; if you use other themes,
 mate-base/mate-applets-meta:appindicator - Pull in mate-extra/mate-indicator-applet for AppIndicator applet
 mate-base/mate-applets-meta:sensors - Pull in mate-extra/mate-sensors-applet for hw sensors applet
 mate-base/mate-desktop:user-guide - Install MATE user guide
+mate-extra/caja-extensions:cdr - Add an extension to burn files to cds using app-cdr/brasero.
 mate-extra/caja-extensions:gajim - Add an extension to support net-im/gajim.
 mate-extra/caja-extensions:image-converter - Add image conversion support.
 mate-extra/caja-extensions:mail - Add an extension to support e-mail functionality.
@@ -4580,8 +4589,6 @@ media-tv/tvheadend:timeshift - Enable TimeShift support
 media-tv/tvheadend:uriparser - Use dev-libs/uriparser
 media-tv/tvheadend:xmltv - Use media-tv/xmltv
 media-tv/v4l-dvb-saa716x:firmware - Install firmware
-media-tv/xawtv:xext - Enable use of XFree extensions (DGA,VidMode,DPMS)
-media-tv/xawtv:zvbi - Enable VBI Decoding Library for Zapping
 media-tv/xbmc:airplay - enable AirPlay support
 media-tv/xbmc:bluray - Enable playback of Blu-ray filesystems
 media-tv/xbmc:cec - Enable support for HDMI-CEC devices via libcec
@@ -4840,7 +4847,7 @@ media-video/transcode:postproc - Build with ffmpeg libpostproc support
 media-video/tsmuxer:qt4 - Installs tsMuxerGUI (needs Qt4)
 media-video/ushare:dlna - Add DLNA (media-libs/libdlna) support
 media-video/vdr:alternatechannel - Use alternate channel on record
-media-video/vdr:bidi - fribid support, for languages, written from right to left
+media-video/vdr:bidi - fribidi support, for languages, written from right to left
 media-video/vdr:ddepgentry - remove duplicate EPG entries
 media-video/vdr:dvlvidprefer - controls video-dir choice on recording
 media-video/vdr:graphtft - support for media-plugins/vdr-grapftftplugin up from vdr-graphtft-0.1.7
@@ -6821,7 +6828,6 @@ sci-libs/ipopt:mumps - Enable sci-libs/mumps support
 sci-libs/lemon:coin - Enable the coinor-clp and coinor-cbc graph algorithms
 sci-libs/lemon:glpk - Enable GNU Linear Programming Kit sci-mathematics/glpk support
 sci-libs/lemon:tools - Build additional tools
-sci-libs/libbufr:lto - Use gold linker and -flto (requires existing env setup)
 sci-libs/libccd:double - Use double precision floats.
 sci-libs/libghemical:mopac7 - Use sci-chemistry/mopac7 for semi-empirical calculations
 sci-libs/libghemical:mpqc - Use sci-chemistry/mpqc for quantum-mechanical calculations
@@ -6856,6 +6862,8 @@ sci-libs/openfoam:opendx - Install opendx visualisation tool
 sci-libs/openfoam:paraview - Enable support for paraview library
 sci-libs/openfoam:src - Install source files
 sci-libs/orocos_kdl:models - Build models for some well known robots.
+sci-libs/pastix:int64 - Build the 64 bits integer library
+sci-libs/pastix:starpu - Build and link with dev-libs/starpu
 sci-libs/pcl:cuda - Adds support for NVIDIA CUDA.
 sci-libs/pcl:openni - Adds support for Kinect-like 3D sensors devices with dev-libs/OpenNI.
 sci-libs/pcl:openni2 - Adds support for Kinect-like 3D sensors devices with dev-libs/OpenNI2 (should be preferred over openni).
@@ -8377,6 +8385,7 @@ x11-wm/xpra:clipboard - Enable clipboard support
 x11-wm/xpra:csc - Enable csc softscaler support
 x11-wm/xpra:dec_av - Enable dec_avcodec support
 x11-wm/xpra:dec_av2 - Enable dec_avcodec2 support
+x11-wm/xpra:lz4 - Enable support for lz4 compression
 x11-wm/xpra:rencode - Enable rencode support
 x11-wm/xpra:server - Build server-side code
 x11-wm/xpra:vpx - Enable vpx image format support
diff --git a/sci-astronomy/wcstools/Manifest b/sci-astronomy/wcstools/Manifest
index f2f342485a1c..3eaca9b180e8 100644
--- a/sci-astronomy/wcstools/Manifest
+++ b/sci-astronomy/wcstools/Manifest
@@ -1 +1,2 @@
 DIST wcstools-3.8.7.tar.gz 961222 SHA256 8e4140fc6d691a0555d5aaa41dbe0253c2edc5775f4a8eebc9667933091b1c28 SHA512 f076c31dd64dad0bda77ec5ae2483035617b69378cfdcf286084c83677c7cb35788769de62f17459e65198107ce534fdee3e38403dd6a44f9881a7631f107187 WHIRLPOOL ca73eeba30c378a3a25621a9371d24683dd3933821cbaf4d5a445e72c63d3ac60af93ca69933f9ec9747b404d67658fdfdcf99f0713357acaa223ffd29c03204
+DIST wcstools-3.9.2.tar.gz 8523655 SHA256 481fe357cf755426fb8e25f4f890e827cce5de657a4e5044d4e31ce27bef1c8b SHA512 b9030cdcaf3f87ab761362a2b8c4a76557694ec4e683371a05e8d58823179d320a2859e883c4ca2c3d65d5adb70ad1ac859587f4c210cd315ced26288fbe107a WHIRLPOOL 257e54e5c545a0584c9ff52f2e3298db73f7d1b4e8d71e0621db18aed8f138dbb0093773883351cbb56ea8a35998ec3b0a2b8e7fc5334dc8d2ebb1c3c4410af4
diff --git a/sci-astronomy/wcstools/files/Makefile.am b/sci-astronomy/wcstools/files/Makefile.am
new file mode 100644
index 000000000000..46abf6d39ae0
--- /dev/null
+++ b/sci-astronomy/wcstools/files/Makefile.am
@@ -0,0 +1,73 @@
+SUBDIRS = libwcs
+INCLUDES = -I$(top_srcdir)/libwcs
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = wcstools.pc
+
+bin_SCRIPTS = wcstools
+
+EXTRA_DIST = wcstools COPYING Readme NEWS Programs
+
+bin_PROGRAMS = \
+	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
+	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
+	keyhead skycoor subpix xy2sky wcshead conpix gettab newfits getfits \
+	imstack imextract sumpix wcsremap getcol wcsgetdate imfill imsmooth imresize \
+	fileroot filename filext char2sp sp2char wcscrlf isnum isrange isfits \
+	isfile simpos bincat
+
+# these ones don't need libwcs
+wcscrlf_SOURCES = crlf.c
+filename_SOURCES = filename.c
+filedir_SOURCES = filedir.c
+fileroot_SOURCES = fileroot.c
+filext_SOURCES = filext.c
+isrange_SOURCES = isrange.c
+
+LDADD = $(top_builddir)/libwcs/libwcstools.la
+
+bincat_SOURCES = bincat.c
+getcol_SOURCES = getcol.c
+wcsgetdate_SOURCES = getdate.c
+gethead_SOURCES = gethead.c
+getfits_SOURCES = getfits.c
+getpix_SOURCES = getpix.c
+gettab_SOURCES = gettab.c
+imcat_SOURCES = imcat.c
+imsize_SOURCES = imsize.c
+imstar_SOURCES = imstar.c
+imwcs_SOURCES = imwcs.c
+immatch_SOURCES = immatch.c
+scat_SOURCES = scat.c
+setpix_SOURCES = setpix.c
+skycoor_SOURCES = skycoor.c
+sumpix_SOURCES = sumpix.c
+xy2sky_SOURCES = xy2sky.c
+simpos_SOURCES = simpos.c
+
+addpix_SOURCES = addpix.c
+char2sp_SOURCES = char2sp.c
+conpix_SOURCES = conpix.c
+cphead_SOURCES = cphead.c
+delwcs_SOURCES = delwcs.c
+delhead_SOURCES = delhead.c
+edhead_SOURCES = edhead.c
+fixpix_SOURCES = fixpix.c
+i2f_SOURCES = i2f.c
+imfill_SOURCES = imfill.c
+imresize_SOURCES = imresize.c
+imsmooth_SOURCES = imsmooth.c
+imhead_SOURCES = imhead.c
+imrot_SOURCES = imrot.c
+imstack_SOURCES = imstack.c
+imextract_SOURCES = imextract.c
+isfile_SOURCES = isfile.c
+isnum_SOURCES = isnum.c
+keyhead_SOURCES = keyhead.c
+newfits_SOURCES = newfits.c
+wcsremap_SOURCES = remap.c
+sethead_SOURCES = sethead.c
+sky2xy_SOURCES = sky2xy.c
+sp2char_SOURCES = sp2char.c
+subpix_SOURCES = subpix.c
+wcshead_SOURCES = wcshead.c
diff --git a/sci-astronomy/wcstools/files/Makefile.libwcs.am b/sci-astronomy/wcstools/files/Makefile.libwcs.am
new file mode 100644
index 000000000000..5905aa3d7955
--- /dev/null
+++ b/sci-astronomy/wcstools/files/Makefile.libwcs.am
@@ -0,0 +1,17 @@
+lib_LTLIBRARIES = libwcstools.la
+libwcstools_la_SOURCES = \
+	imsetwcs.c imgetwcs.c matchstar.c findstar.c daoread.c wcscon.c \
+	fitswcs.c wcsinit.c wcs.c ty2read.c webread.c tmcread.c \
+	gscread.c gsc2read.c ujcread.c uacread.c ubcread.c ucacread.c \
+	sdssread.c tabread.c binread.c ctgread.c actread.c catutil.c \
+	skybotread.c imrotate.c fitsfile.c imhfile.c \
+	hget.c hput.c imio.c dateutil.c imutil.c \
+	worldpos.c tnxpos.c zpxpos.c dsspos.c platepos.c \
+	sortstar.c platefit.c iget.c fileutil.c \
+	wcslib.c lin.c cel.c proj.c sph.c wcstrig.c distort.c poly.c
+
+wcsdir = $(includedir)/wcs
+wcs_HEADERS = \
+	wcscat.h wcslib.h wcs.h lwcs.h fitshead.h fitsfile.h imio.h
+
+noinst_HEADERS = fitsfile1.h wcscat1.h
diff --git a/sci-astronomy/wcstools/files/configure.ac b/sci-astronomy/wcstools/files/configure.ac
new file mode 100644
index 000000000000..3a46108cd304
--- /dev/null
+++ b/sci-astronomy/wcstools/files/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([wcstools], [3.9.x] , [http://tdc-www.harvard.edu/wcstools/])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_HEADERS([config.h])
+
+AC_PROG_CC
+LT_INIT([disable-static])
+AC_CHECK_LIB([m], [sin])
+AC_CONFIG_FILES([libwcs/Makefile Makefile wcstools.pc])
+AC_OUTPUT
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch
new file mode 100644
index 000000000000..27a912f5a902
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-RASortStars.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Fix uninitialized value for haspm in RASortStars()
+ This fixes a crash with 'imstar -s'.
+--- a/libwcs/sortstar.c
++++ b/libwcs/sortstar.c
+@@ -417,6 +417,8 @@
+ 	hasnum = 1;
+     if (spra != NULL && spdec != NULL)
+ 	haspm = 1;
++    else
++	haspm = 0;
+     if (sx != NULL && sy != NULL)
+ 	hasxy = 1;
+     else
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch
new file mode 100644
index 000000000000..57bb8cb99324
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-compiler_warnings.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix some compiler warnings.
+--- a/imcat.c
++++ b/imcat.c
+@@ -1778,7 +1778,7 @@
+ 		if (refcat == UCAC2 || refcat == UCAC3 || refcat == UCAC4) {
+ 		    nim = gc[i] / 1000;
+ 		    nct = gc[i] % 1000;
+-		    sprintf (temp, "  ni  nc", nim, nct);
++		    sprintf (temp, "  ni%i  nc%i", nim, nct);
+ 		    strcat (headline, temp);
+ 		    }
+ 		else if (gcset)
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch
new file mode 100644
index 000000000000..694c0720ab93
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-mayhem.patch
@@ -0,0 +1,69 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Fix several bugs that appear in during the mayhem tests.
+Bug: http://bugs.debian.org/715682
+Bug: http://bugs.debian.org/715755
+Bug: http://bugs.debian.org/715905
+Bug: http://bugs.debian.org/715956
+Bug: http://bugs.debian.org/715957
+--- a/getfits.c
++++ b/getfits.c
+@@ -108,6 +108,7 @@
+ 		usage ("Right ascension given but no declination");
+ 	    else {
+ 		strcpy (rastr, *av);
++		ac--;
+ 		strcpy (decstr, *++av);
+ 		ra0 = str2ra (rastr);
+ 		dec0 = str2dec (decstr);
+--- a/getpix.c
++++ b/getpix.c
+@@ -83,6 +83,7 @@
+     char *crange;       /* Column range string */
+     char *rstr;
+     char *dstr = NULL;
++    char rastr[32], decstr[32];
+     char *cstr;
+     int systemp;
+     int i;
+--- a/bincat.c
++++ b/bincat.c
+@@ -156,7 +156,7 @@
+ 	    if (ac < 3)
+ 		usage((char)0, "3 arguments needed for center coordinate");
+ 	    else {
+-		strcpy (rastr, *++av);
++		strcpy (rastr, *av);
+ 		ac--;
+ 		strcpy (decstr, *++av);
+ 		setcenter (rastr, decstr);
+--- a/cphead.c
++++ b/cphead.c
+@@ -137,7 +137,7 @@
+ 		    break;
+ 	
+ 		case 'w': /* Copy entire WCS */
+-		    nkwd1 = 87;
++		    nkwd1 = 236;
+ 		    if (nkwd + nkwd1 > maxnkwd) {
+ 			maxnkwd = nkwd + nkwd1 + 32;
+ 			kwdnew = (char **) calloc (maxnkwd, sizeof (void *));
+@@ -148,7 +148,7 @@
+ 			free (kwd);
+ 			kwd = kwdnew;
+ 			}
+-		    for (ikwd = nkwd; i < nkwd+nkwd1; i++) {
++		    for (ikwd = nkwd; ikwd < nkwd+nkwd1+32; ikwd++) {
+ 			kwd[ikwd] = (char *) calloc (32, 1);
+ 			}
+ 		    strcpy (kwd[nkwd], "RA");
+--- a/filext.c
++++ b/filext.c
+@@ -80,7 +80,7 @@
+ 		    ext = ext + 1;
+ 		}
+ 	    }
+-	printf ("%s\n", ext);
++	printf ("%s\n", (ext)?ext:"");
+ 	}
+ 
+     return (0);
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch
new file mode 100644
index 000000000000..7c666c1277b3
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-spelling.patch
@@ -0,0 +1,69 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: Spellfixes to make lintian happy
+--- a/libwcs/fitsfile.c
++++ b/libwcs/fitsfile.c
+@@ -1583,7 +1583,7 @@
+ 	if (!access (filename, 0)) {
+ 	    fd = open (filename, O_WRONLY);
+ 	    if (fd < 3) {
+-		snprintf (fitserrmsg,79, "FITSWIMAGE:  file %s not writeable\n", filename);
++		snprintf (fitserrmsg,79, "FITSWIMAGE:  file %s not writable\n", filename);
+ 		return (0);
+ 		}
+ 	    }
+@@ -1622,7 +1622,7 @@
+ 	if (!access (filename, 0)) {
+ 	    fd = open (filename, O_WRONLY);
+ 	    if (fd < 3) {
+-		snprintf (fitserrmsg,79, "FITSWEXT:  file %s not writeable\n",
++		snprintf (fitserrmsg,79, "FITSWEXT:  file %s not writable\n",
+ 			 filename);
+ 		return (0);
+ 		}
+@@ -1884,7 +1884,7 @@
+     if (!access (filename, 0)) {
+ 	fdout = open (filename, O_WRONLY);
+ 	if (fdout < 3) {
+-	    snprintf (fitserrmsg,79, "FITSCIMAGE:  file %s not writeable\n", filename);
++	    snprintf (fitserrmsg,79, "FITSCIMAGE:  file %s not writable\n", filename);
+ 	    return (0);
+ 	    }
+ 	}
+@@ -1970,7 +1970,7 @@
+     if (!access (filename, 0)) {
+ 	fd = open (filename, O_WRONLY);
+ 	if (fd < 3) {
+-	    snprintf (fitserrmsg, 79, "FITSWHEAD:  file %s not writeable\n", filename);
++	    snprintf (fitserrmsg, 79, "FITSWHEAD:  file %s not writable\n", filename);
+ 	    return (0);
+ 	    }
+ 	}
+@@ -2072,7 +2072,7 @@
+     if (ext != NULL)
+ 	*ext = cext;
+     if (fd < 3) {
+-	snprintf (fitserrmsg, 79, "FITSWEXHEAD:  file %s not writeable\n", filename);
++	snprintf (fitserrmsg, 79, "FITSWEXHEAD:  file %s not writable\n", filename);
+ 	return (-1);
+ 	}
+ 
+--- a/libwcs/imhfile.c
++++ b/libwcs/imhfile.c
+@@ -896,7 +896,7 @@
+     if (!access (hdrname, 0)) {
+ 	fd = open (hdrname, O_WRONLY);
+ 	if (fd < 3) {
+-	    fprintf (stderr, "IRAFWIMAGE:  file %s not writeable\n", hdrname);
++	    fprintf (stderr, "IRAFWIMAGE:  file %s not writable\n", hdrname);
+ 	    return (0);
+ 	    }
+ 	}
+@@ -993,7 +993,7 @@
+     if (!access (pixname, 0)) {
+ 	fd = open (pixname, O_WRONLY);
+ 	if (fd < 3) {
+-	    fprintf (stderr, "IRAFWIMAGE:  file %s not writeable\n", pixname);
++	    fprintf (stderr, "IRAFWIMAGE:  file %s not writable\n", pixname);
+ 	    return (0);
+ 	    }
+ 	}
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch
new file mode 100644
index 000000000000..4ec5993cb5f5
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-sprintf.patch
@@ -0,0 +1,36 @@
+Author: Ole Streicher <olebole@debian.net>
+Description: Fix overlappong buffers in sprintf
+ In sprintf, overlapping buffers lead to undefined behaviour.
+ This causes different results on Debian and Ubuntu.
+--- a/imstar.c
++++ b/imstar.c
+@@ -818,7 +818,7 @@
+ 	    sprintf (headline, "%7.2f %7.2f %6.2f  %d",
+ 		    sx[i],sy[i],smag[i],sp[i]);
+ 	    if (iswcs (wcs))
+-		sprintf (headline, "%s %s %s", headline, rastr, decstr);
++		sprintf (headline + strlen(headline), " %s %s", rastr, decstr);
+ 	    if (wfile)
+ 		fprintf (fd, "%s\n", headline);
+ 	    else
+@@ -827,14 +827,14 @@
+ 	else {
+ 	    sprintf (headline, "%3d %s %s %6.2f", i+1,rastr,decstr,smag[i]);
+ 	    if (wcs->nxpix < 100.0 && wcs->nypix > 100.0)
+-		sprintf (headline, "%s  %5.2f %5.2f %d",
+-		headline, sx[i],sy[i], sp[i]);
++		sprintf (headline + strlen(headline), "  %5.2f %5.2f %d",
++		sx[i],sy[i], sp[i]);
+ 	    else if (wcs->nxpix < 1000.0 && wcs->nypix < 1000.0)
+-		sprintf (headline, "%s  %6.2f %6.2f %d",
+-		headline, sx[i],sy[i], sp[i]);
++		sprintf (headline + strlen(headline), "  %6.2f %6.2f %d",
++		sx[i],sy[i], sp[i]);
+ 	    else
+-		sprintf (headline, "%s  %7.2f %7.2f %d",
+-		headline, sx[i],sy[i], sp[i]);
++		sprintf (headline + strlen(headline), "  %7.2f %7.2f %d",
++		sx[i],sy[i], sp[i]);
+ 	    if (wfile)
+ 		fprintf (fd, "%s\n", headline);
+ 	    else
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch
new file mode 100644
index 000000000000..4ebc20609b6f
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-use_abort.patch
@@ -0,0 +1,14 @@
+Author: Ole Streicher <debian@liska.ath.cx>
+Description: If a unrecoverable error occurred, abort() instead of exit()
+ to allow the user for tracing the problem.
+--- a/libwcs/poly.c
++++ b/libwcs/poly.c
+@@ -43,7 +43,7 @@
+ void	qerror(char *msg1, char *msg2)
+   {
+   fprintf(stderr, "\n> %s%s\n\n",msg1,msg2);
+-  exit(-1);
++  abort();
+   }
+ 
+ 
diff --git a/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch b/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch
new file mode 100644
index 000000000000..f8de3da5ad01
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools-3.9.2-wcsinit_crash.patch
@@ -0,0 +1,20 @@
+Author: Ole Streicher <olebole@debian.net>
+Description: Increase c*type and ptype field string lengths
+ This is needed to allow C1TYPE='RA---TAN-SIP'
+Bug: https://bugs.launchpad.net/ubuntu/+source/saods9/+bug/1458333
+--- a/libwcs/wcsinit.c
++++ b/libwcs/wcsinit.c
+@@ -399,11 +399,11 @@
+ 	}
+ 
+     /* World coordinate system reference coordinate information */
+-    if (hgetsc (hstring, "CTYPE1", &mchar, 16, ctype1)) {
++    if (hgetsc (hstring, "CTYPE1", &mchar, 9, ctype1)) {
+ 
+ 	/* Read second coordinate type */
+ 	strcpy (ctype2, ctype1);
+-	if (!hgetsc (hstring, "CTYPE2", &mchar, 16, ctype2))
++	if (!hgetsc (hstring, "CTYPE2", &mchar, 9, ctype2))
+ 	    twod = 0;
+ 	else
+ 	    twod = 1;
diff --git a/sci-astronomy/wcstools/files/wcstools.pc.in b/sci-astronomy/wcstools/files/wcstools.pc.in
new file mode 100644
index 000000000000..c8eb8b094a0a
--- /dev/null
+++ b/sci-astronomy/wcstools/files/wcstools.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE_NAME@
+Description: World Coordinate System Library and Tools
+Version: @PACKAGE_VERSION@
+URL: http://tdc-www.harvard.edu/wcstools/
+Libs: -L${libdir} -lwcstools
+Libs.private: -lm
+Cflags: -I${includedir}/wcs
+
diff --git a/sci-astronomy/wcstools/wcstools-3.9.2.ebuild b/sci-astronomy/wcstools/wcstools-3.9.2.ebuild
new file mode 100644
index 000000000000..b228fed5c0b4
--- /dev/null
+++ b/sci-astronomy/wcstools/wcstools-3.9.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils multilib
+
+DESCRIPTION="World Coordinate System library for astronomical FITS images"
+HOMEPAGE="http://tdc-www.harvard.edu/software/wcstools"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DOCS=( Readme Programs NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/wcstools-3.9.2-compiler_warnings.patch
+	"${FILESDIR}"/wcstools-3.9.2-mayhem.patch
+	"${FILESDIR}"/wcstools-3.9.2-RASortStars.patch
+	"${FILESDIR}"/wcstools-3.9.2-spelling.patch
+	"${FILESDIR}"/wcstools-3.9.2-sprintf.patch
+	"${FILESDIR}"/wcstools-3.9.2-use_abort.patch
+	"${FILESDIR}"/wcstools-3.9.2-wcsinit_crash.patch
+)
+
+src_prepare() {
+	einfo "Copying gentoo autotools files"
+	local f
+	for f in "${FILESDIR}"/{configure.ac,wcstools.pc.in,Makefile.am}; do
+		cp ${f} "${S}"/ || die
+	done
+	cp "${FILESDIR}"/Makefile.libwcs.am "${S}"/libwcs/Makefile.am || die
+	# avoid colliding with fixdos, getdate and remap from other packages
+	sed -i \
+		-e 's/getdate/wcsgetdate/' \
+		-e 's/crlf/wcscrlf/' \
+		-e 's/remap/wcsremap/' \
+		-e "s/3.... Programs/${PV} Programs/" \
+		wcstools || die
+	autotools-utils_src_prepare
+}
+
+src_test() {
+	einfo "Testing various wcstools programs"
+	./newfits -a 10 -j 248 41 -p 0.15 test.fits || die "test newfits failed"
+	./sethead test.fits A=1 B=1 ||  die "test sethead failed"
+	[[ "$(./gethead test.fits RA)" == "16:32:00.0000" ]] \
+		|| die "test gethead failed"
+	rm test.fits
+}
+
+src_install() {
+	autotools-utils_src_install
+	doman man/man1/*
+	newdoc libwcs/NEWS NEWS.libwcs
+	newdoc libwcs/Readme Readme.libwcs
+
+}
+
+pkg_postinst() {
+	elog "The following execs have been renamed to avoid colliding"
+	elog "with other packages:"
+	elog " getdate -> wcsgetdate"
+	elog " crlf    -> wcscrlf"
+	elog " remap   -> wcsremap"
+}
diff --git a/sci-chemistry/pymol-apbs-plugin/ChangeLog-2015 b/sci-chemistry/pymol-apbs-plugin/ChangeLog-2015
deleted file mode 100644
index 3981f915ee0c..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/ChangeLog-2015
+++ /dev/null
@@ -1,80 +0,0 @@
-# ChangeLog for sci-chemistry/pymol-apbs-plugin
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-apbs-plugin/ChangeLog,v 1.16 2015/04/08 18:22:14 mgorny Exp $
-
-  08 Apr 2015; Michał Górny <mgorny@gentoo.org>
-  pymol-apbs-plugin-2.1_p26.ebuild:
-  Drop old Python implementations
-
-  13 Aug 2014; Andreas Schuerch <nativemad@gentoo.org>
-  pymol-apbs-plugin-2.1_p26-r1.ebuild:
-  x86 stable, see bug 507142
-
-*pymol-apbs-plugin-2.1_p26-r1 (22 Jul 2014)
-
-  22 Jul 2014; Justin Lecher <jlec@gentoo.org>
-  +pymol-apbs-plugin-2.1_p26-r1.ebuild:
-  Fix double prefix
-
-  10 Jul 2014; Chema Alonso <nimiux@gentoo.org>
-  pymol-apbs-plugin-2.1_p26.ebuild:
-  Stable for amd64 wrt bug #507142
-
-*pymol-apbs-plugin-2.1_p26 (22 Nov 2013)
-
-  22 Nov 2013; Justin Lecher <jlec@gentoo.org>
-  +pymol-apbs-plugin-2.1_p26.ebuild,
-  +files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch, metadata.xml:
-  Version Bump, add fix for tcltk8.6 support
-
-  19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
-  Changed herd to sci-chemistry
-
-*pymol-apbs-plugin-2.1_p24 (11 Nov 2010)
-
-  11 Nov 2010; Justin Lecher <jlec@gentoo.org>
-  +pymol-apbs-plugin-2.1_p24.ebuild:
-  Version Bump
-
-  24 Jun 2010; Christoph Mende <angelos@gentoo.org>
-  pymol-apbs-plugin-0_p18.ebuild:
-  Stable on amd64 wrt bug #309007
-
-  09 Jun 2010; Justin Lecher <jlec@gentoo.org>
-  -pymol-apbs-plugin-0_p11.ebuild, pymol-apbs-plugin-0_p15.ebuild,
-  +pymol-apbs-plugin-0_p18.ebuild:
-  Version Bump, fixes for python.eclass usage, removed old version
-
-*pymol-apbs-plugin-0_p18 (09 Jun 2010)
-
-  09 Jun 2010; Justin Lecher <jlec@gentoo.org>
-  pymol-apbs-plugin-0_p15.ebuild, +pymol-apbs-plugin-0_p18.ebuild:
-  Version Bump, fixes for python.eclass usage
-
-  23 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
-  pymol-apbs-plugin-0_p15.ebuild:
-  stable x86, bug 309007
-
-  11 Mar 2010; Joseph Jezak <josejx@gentoo.org>
-  pymol-apbs-plugin-0_p15.ebuild:
-  Marked ~ppc.
-
-  23 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  pymol-apbs-plugin-0_p15.ebuild:
-  RESTRICT_PYTHON_ABIS="3.*"
-
-  19 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
-  pymol-apbs-plugin-0_p15.ebuild:
-  keyworded for {amd64,x86}-linux
-
-*pymol-apbs-plugin-0_p15 (11 Feb 2010)
-
-  11 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
-  +pymol-apbs-plugin-0_p15.ebuild:
-  Version Bump, EAPI=3 and multiple python support
-
-*pymol-apbs-plugin-0_p11 (01 Feb 2010)
-
-  01 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
-  +pymol-apbs-plugin-0_p11.ebuild, +metadata.xml:
-  Seperated ebuild for pymol apbs plugin
diff --git a/sci-chemistry/pymol-apbs-plugin/Manifest b/sci-chemistry/pymol-apbs-plugin/Manifest
deleted file mode 100644
index 8d2bd3861103..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pymol-apbs-plugin-0_p15.py 104351 SHA256 c5a259ddc1931f1ec4efe0ffc3ae9e9ac4a84a28c83a4f93a06ebb7c1bef0c1d SHA512 1bfba44aed8ca03300430e00b6b2a3297bda5820b06a7a8914e5396c6720005ea5acaebc07bdf5d27d82f563afb8210e59af145422c7cacab92160f6f22874e1 WHIRLPOOL a0737250151503b431aa302c3ca175088b068a5aaf7e55c6673a9dd077d28ff7f58f40d2080426484a704ecc4e43f2845ae0d9ef6b5fc3ad850fff5bdffe36c0
-DIST pymol-apbs-plugin-0_p18.py 108766 SHA256 ec09c5a0903ac965cc29fcf0a3c1999bd939f9791d037915596092698855d12c SHA512 e736c2852851014eb412dcb573ee177f57dd9dd163673d5c7df1240f0f9c21fdc4277c647ba2a9e510d1cf8e53fabc6671da5a5b90b989cbcfc0835552c4ffdb WHIRLPOOL 3b418afc7198752e7d3578574238756c9a992b6c7c3a16d474a7d5363533d91cedc8300033f60666605efae478a2606b9b5e1a6e6b74aed8a0ec46842b8b02ac
-DIST pymol-apbs-plugin-2.1_p24.py 113049 SHA256 d51bb1bbbf641777ee36713c0c47696d7906179e42cac8cdd0e8e156ef081c9f SHA512 49141ea7e4a3a3430d342fb4fbb497d522ce6485c6d9e3527414519574eab7b8218fe240f26920013676528c40059a46341d58153bfe9d05bf747ead926b2cfd WHIRLPOOL 17a4f9ed9670b9a7f82395a9cf1ad465635f840b7389c10ad8c8eae3262c3696383bbacadf5aee9fed817eff7370008cc85a1666896fed56dffb0163e4c3d7e1
-DIST pymol-apbs-plugin-2.1_p26.py 113086 SHA256 552242b4f5b47f298eeb0616e0d51924b4a7649dc8a16e4809e923dbcb97738d SHA512 3561d077875a1880d6badccf835db3d17e0c45416accd6127cbef7c550711908b47ccb392563e3d29ecb7d6527c098584eeabb6490d1033720ed7efe751d0fb0 WHIRLPOOL dccd32b0193e74e505d69922b441323fb24b0ba30aa85f4d69b94663ab406a57b772985ca2c56146e2c4b929f73b321095c3ae2caf95f297f14d8b31671f475e
diff --git a/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch b/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch
deleted file mode 100644
index c3675cf4c0d0..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/files/pymol-apbs-plugin-2.1_p26-tcltk8.6.patch
+++ /dev/null
@@ -1,176 +0,0 @@
---- pymol-apbs-plugin-2.1_p26.py.orig        2013-08-16 20:29:27.000000000 -0400
-+++ pymol-apbs-plugin-2.1_p26.py        2013-08-16 20:31:35.000000000 -0400
-@@ -560,7 +560,8 @@
-         # Set up the Main page
-         page = self.notebook.add('Main')
-         group = Pmw.Group(page,tag_text='Main options')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         self.selection = Pmw.EntryField(group.interior(),
-                                         labelpos='w',
-                                         label_text='Selection to use: ',
-@@ -606,7 +607,8 @@
-         page = self.notebook.add('Configuration')
- 
-         group = Pmw.Group(page,tag_text='Dielectric Constants')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column=0, row=0)
-         self.interior_dielectric = Pmw.EntryField(group.interior(),labelpos='w',
-                                    label_text = 'Protein Dielectric:',
-@@ -625,7 +627,8 @@
-             #entry.pack(side='left',fill='both',expand=1,padx=4) # side-by-side
-             entry.pack(fill='x',expand=1,padx=4,pady=1) # vertical
-         group = Pmw.Group(page,tag_text='Other')
--        group.pack(fill='both',expand=1, padx=4, pady=5)
-+        #group.pack(fill='both',expand=1, padx=4, pady=5)
-+        group.grid(padx=4, pady=5, sticky=(N, S, E, W))
-         group.grid(column=1, row=1,columnspan=4)
-         self.max_mem_allowed = Pmw.EntryField(group.interior(),labelpos='w',
-                                               label_text = 'Maximum Memory Allowed (MB):',
-@@ -683,7 +686,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text='Ions')
--        group.pack(fill='both',expand=1, padx=4, pady=5)
-+        #group.pack(fill='both',expand=1, padx=4, pady=5)
-+        group.grid(padx=4, pady=5, sticky=(N, S, E, W))
-         group.grid(column=0, row=1, )
-         self.ion_plus_one_conc = Pmw.EntryField(group.interior(),
-                                                 labelpos='w',
-@@ -742,7 +746,8 @@
-             entry.pack(fill='x',expand=1,padx=4)
- 
-         group = Pmw.Group(page,tag_text = 'Coarse Mesh Length')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 1, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_coarse_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -757,7 +762,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text = 'Fine Mesh Length')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 2, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_fine_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -772,7 +778,8 @@
- 
- 
-         group = Pmw.Group(page,tag_text = 'Grid Center')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 3, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_center_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -786,7 +793,8 @@
-             getattr(self,'grid_center_%s'%coord).pack(fill='x', expand=1, padx=4, pady=1)
- 
-         group = Pmw.Group(page,tag_text = 'Grid Points')
--        group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+        group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
-         group.grid(column = 4, row = 0)
-         for coord in 'x y z'.split():
-             setattr(self,'grid_points_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -804,7 +812,8 @@
-         page.grid_columnconfigure(5,weight=1)
-         page = self.notebook.add('Program Locations')
-         group = Pmw.Group(page,tag_text='Locations')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         def quickFileValidation(s):
-             if s == '': return Pmw.PARTIAL
-             elif os.path.isfile(s): return Pmw.OK
-@@ -867,7 +876,8 @@
-         
-         page = self.notebook.add('Temp File Locations')
-         group = Pmw.Group(page,tag_text='Locations')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         self.pymol_generated_pqr_filename = Pmw.EntryField(group.interior(),
-                                                            labelpos = 'w',
-                                                            label_pyclass = FileDialogButtonClassFactory.get(self.setPymolGeneratedPqrFilename),
-@@ -915,17 +925,20 @@
-         page = self.notebook.add('Visualization (1)')
-         group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=1)
-         self.visualization_group_1 = group
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
- 
-         page = self.notebook.add('Visualization (2)')
-         group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=2)
-         self.visualization_group_2 = group
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
- 
-         # Create a couple of other empty pages
-         page = self.notebook.add('About')
-         group = Pmw.Group(page, tag_text='About PyMOL APBS Tools')
--        group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+        group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
-         text = """This plugin integrates PyMOL (http://PyMOL.org/) with APBS (http://www.poissonboltzmann.org/apbs/).
- 
- Documentation may be found at
-@@ -2158,7 +2171,8 @@
-             self.update_buttonbox = Pmw.ButtonBox(self.mm_group.interior(), padx=0)
-             self.update_buttonbox.pack(side=LEFT)
-             self.update_buttonbox.add('Update',command=self.refresh)
--            self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            #self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            self.mm_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.ms_group = Pmw.Group(self.interior(),tag_text='Molecular Surface')
-             self.ms_buttonbox = Pmw.ButtonBox(self.ms_group.interior(), padx=0)
-@@ -2209,7 +2223,8 @@
-             bars = (self.mol_surf_low,self.mol_surf_middle,self.mol_surf_high)
-             Pmw.alignlabels(bars)
-             for bar in bars: bar.pack(side=LEFT)
--            self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.ms_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.fl_group = Pmw.Group(self.interior(),tag_text='Field Lines')
-             self.fl_buttonbox = Pmw.ButtonBox(self.fl_group.interior(), padx=0)
-@@ -2224,7 +2239,8 @@
-                                   text = """Follows same coloring as surface.""",
-                                   )
-             label.pack()
--            self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            #self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+            self.fl_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.pi_group = Pmw.Group(self.interior(),tag_text='Positive Isosurface')
-             self.pi_buttonbox = Pmw.ButtonBox(self.pi_group.interior(), padx=0)
-@@ -2243,7 +2259,8 @@
-                                             entryfield_validate = {'validator' : 'real', 'min':0}
-                                             )
-             self.pos_surf_val.pack(side=LEFT)
--            self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.pi_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
-             self.ni_group = Pmw.Group(self.interior(),tag_text='Negative Isosurface')
-             self.ni_buttonbox = Pmw.ButtonBox(self.ni_group.interior(), padx=0)
-@@ -2262,7 +2279,8 @@
-                                             entryfield_validate = {'validator' : 'real', 'max':0}
-                                             )
-             self.neg_surf_val.pack(side=LEFT)
--            self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            #self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+            self.ni_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
- 
- 
- 
diff --git a/sci-chemistry/pymol-apbs-plugin/metadata.xml b/sci-chemistry/pymol-apbs-plugin/metadata.xml
deleted file mode 100644
index 41a45ae4e27c..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">pymolapbsplugin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
deleted file mode 100644
index 8609778501ce..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p15.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild
deleted file mode 100644
index 11596fe54cbf..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-0_p18.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild
deleted file mode 100644
index 627780c1ff39..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p24.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit python
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://pymolapbsplugin.svn.sourceforge.net/viewvc/pymolapbsplugin/trunk/src/apbsplugin.py?revision=${MY_PV} -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-RDEPEND="
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			-i ${P}.py
-
-		insinto $(python_get_sitedir)/pmg_tk/startup/
-		newins ${P}.py apbs_tools.py || die
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize pmg_tk/startup/apbs_tools.py
-}
-
-pkg_postrm() {
-	python_mod_cleanup pmg_tk/startup/apbs_tools.py
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
deleted file mode 100644
index 6d3aac6c9c49..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://sourceforge.net/p/pymolapbsplugin/code/${MY_PV}/tree/trunk/src/apbsplugin.py?format=raw -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tcltk8.6.patch
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		cd "${BUILD_DIR}" || die
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			${P}.py > apbs_tools.py || die
-
-		python_moduleinto pmg_tk/startup
-		python_domodule apbs_tools.py
-		python_optimize
-	}
-	python_foreach_impl installation
-}
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild
deleted file mode 100644
index f943d5d50e3d..000000000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-2.1_p26.ebuild
+++ /dev/null
@@ -1,56 +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 eutils python-r1
-
-MY_PV="${PV##*_p}"
-
-DESCRIPTION="APBS plugin for pymol"
-HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/"
-SRC_URI="http://sourceforge.net/p/pymolapbsplugin/code/${MY_PV}/tree/trunk/src/apbsplugin.py?format=raw -> ${P}.py"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="pymol"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sci-chemistry/apbs
-	sci-chemistry/pdb2pqr
-	!<sci-chemistry/pymol-1.2.2-r1"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	mkdir "${S}"
-	cp "${DISTDIR}"/${P}.py "${S}"/
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tcltk8.6.patch
-	python_copy_sources
-}
-
-src_install() {
-	installation() {
-		cd "${BUILD_DIR}" || die
-		sed \
-			-e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \
-			-e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \
-			-e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \
-			-e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \
-			${P}.py > apbs_tools.py
-
-		python_moduleinto pmg_tk/startup
-		python_domodule apbs_tools.py || die
-		python_optimize
-	}
-	python_foreach_impl installation
-}
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild
index 7e90fedff06d..4b1c62b1063d 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/geocode-glib"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild
index cd38ed611d49..693439fe6b8d 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=app-misc/geoclue-0.12.99:2.0
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index df8d0d0f285b..565d1854e294 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,2 +1,2 @@
 DIST cfitsio-3.360.tar.gz 4104894 SHA256 b5fb209583c76a0bcc39808e55ebf2417b9c26114c59db1a3f49ea1ede5fa95d SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072 WHIRLPOOL 05589a27c6fa83a0240b26924954c1c6d25d985ad609dfbd37fccfe5758fd28efbd97a5ec289803053e2f53e053e51c017292845de1b4368bcd1725fa2eccdb7
-DIST cfitsio-3.38.tar.gz 4142216 SHA256 e2a4e4fa9ed7f32afb87527b53242bcfb080b5832eec56bca57fb640efac5f84 SHA512 ed1bb8be48778dfaf5f5f973af4905b264f0600c29dcabf994d6c0d79f0cf472f41ed81c2d183b892447a856da795f50fe68a1364f34ab5fce55d13a4343add0 WHIRLPOOL 3ff0978f82f05b09133a61955e855e3633b006009dab165157ec8437d4b284e620c8d9b5a232095dcdae84dfffb8daa42535aac4a3f1cf492b39c96566f79b31
+DIST cfitsio-3.38.tar.gz 4142236 SHA256 d4aef44401b1d2142a13ffc3a28cce7c77264ca0ddce164d87fdcb275503dd5d SHA512 7428c1c87736ca384153f7f810e0bdbccdcc2f41892b0b9ceda9e5efb20655585c2789b16510a5362f8b67ef53a0ac443094786966e5748cbe7ad828599723fc WHIRLPOOL 8a809e0cc89357a983e60c56e41ef5d758561751d49a2443c0c0b2640d0573f6f7313c99342458600aa28739e0ea55f85adc1e04505777c3339dc750aa829bcf
diff --git a/sci-libs/cfitsio/cfitsio-3.38.ebuild b/sci-libs/cfitsio/cfitsio-3.38-r1.ebuild
similarity index 100%
rename from sci-libs/cfitsio/cfitsio-3.38.ebuild
rename to sci-libs/cfitsio/cfitsio-3.38-r1.ebuild
diff --git a/sci-libs/libbufr/ChangeLog-2015 b/sci-libs/libbufr/ChangeLog-2015
deleted file mode 100644
index e2e944a63e99..000000000000
--- a/sci-libs/libbufr/ChangeLog-2015
+++ /dev/null
@@ -1,52 +0,0 @@
-# ChangeLog for sci-libs/libbufr
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libbufr/ChangeLog,v 1.11 2015/08/03 23:07:35 mrueg Exp $
-
-  03 Aug 2015; Manuel Rüger <mrueg@gentoo.org> -libbufr-000360.ebuild:
-  Remove old.
-
-  18 Oct 2012; Justin Lecher <jlec@gentoo.org> libbufr-000360.ebuild,
-  libbufr-000387.ebuild, metadata.xml:
-  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
-  updated fortran-2.eclass
-
-  07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
-  Drop maintainer due retirement, #24135.
-
-  21 Jun 2011; Justin Lecher <jlec@gentoo.org> libbufr-000360.ebuild,
-  libbufr-000387.ebuild:
-  Add dependency on virtual/fortran
-
-  21 Jun 2011; Justin Lecher <jlec@gentoo.org> libbufr-000360.ebuild,
-  libbufr-000387.ebuild:
-  Added fortran-2.eclass support
-
-  14 May 2011; Steve Arnold <nerdboy@gentoo.org> libbufr-000387.ebuild:
-  Updated test file generation (note: do not remove blanks).
-
-*libbufr-000387 (03 May 2011)
-
-  03 May 2011; Steve Arnold <nerdboy@gentoo.org> +libbufr-000387.ebuild,
-  +files/libbufr-makefile.patch:
-  Updated to newer upstream version, including tests.
-
-  17 Mar 2011; Steve Arnold <nerdboy@gentoo.org> libbufr-000360.ebuild:
-  Updated to address static makefiles ignoring flags; see bug 334901.
-  New version with ppc support coming soon.
-
-  28 Dec 2010; Steve Arnold <nerdboy@gentoo.org> libbufr-000360.ebuild,
-  +files/libbufr-000360-gcc-includes.patch:
-  Updated with some QA fixes (bug #349458) including a minor gcc patch. 
-  Everything looks clean and green now...
-
-  01 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> libbufr-000360.ebuild:
-  Remove use of fortran eclass
-
-*libbufr-000360 (07 Dec 2008)
-
-  07 Dec 2008; Steve Arnold <nerdboy@gentoo.org> +metadata.xml,
-  +libbufr-000360.ebuild:
-  New ebuild for the open source BUFR library from ECMWF (requires at least
-  one supported Fortran compiler).  Tested on amd64 and x86 with one of the
-  included test files, but I haven't tested with local tables yet.  Needs
-  some arch luv...
diff --git a/sci-libs/libbufr/Manifest b/sci-libs/libbufr/Manifest
deleted file mode 100644
index e0171be94843..000000000000
--- a/sci-libs/libbufr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bufrdc_000405.tar.gz 11873311 SHA256 0c3ab33bdb3eea600c5af6f1e4064a000ec143f4c96a14b72ca09666ca3c3775 SHA512 3355d6bac54ef152f9feb13ae13f3c94f4e01a665a4b9bc7f85f0c98f9aa37411170668ba9adfb6b62c2fe906d0dff67b03a708cdf1acd21a0037e327c7c6169 WHIRLPOOL f97662c240e40086be2e2f7d33d446280576dd79ff119374d54d02af05bd51c9176a6592d965765baf549043ee80e8bb9e824e3149d4ce85599db1f5e3f42e10
diff --git a/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch b/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch
deleted file mode 100644
index 8b0ac1ce9a65..000000000000
--- a/sci-libs/libbufr/files/libbufr-000360-gcc-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- examples/bufr_decode.c.orig	2008-09-17 03:02:39.000000000 -0700
-+++ examples/bufr_decode.c	2010-12-27 19:03:57.000000000 -0800
-@@ -7,9 +7,9 @@
- * See LICENSE and gpl-3.0.txt for details.
- */
- 
--#include "stdio.h"
--#include "stdlib.h"
--
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- 
- int main(int argc, char *argv[])
diff --git a/sci-libs/libbufr/files/libbufr-000405-makefile.patch b/sci-libs/libbufr/files/libbufr-000405-makefile.patch
deleted file mode 100644
index 08b30ded8d72..000000000000
--- a/sci-libs/libbufr/files/libbufr-000405-makefile.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- Makefile.orig	2016-01-04 13:09:58.661150785 -0800
-+++ Makefile	2016-01-04 13:17:12.707621825 -0800
-@@ -1,7 +1,7 @@
- #                                Makefile for libbufrex
- #
- R64 = R64
--TARGETS = all clean
-+TARGETS = all clean test
- LIBRARY = libbufr$(R64).a
- SHELL=/bin/sh
- SUBDIRS = fortranC bufrdc pbio bufrtables examples
-@@ -11,12 +11,14 @@
- 	( echo "*************************"; \
- 	  echo "*** Make in $$name "; \
- 	  echo "*************************"; \
--	cd $$name ; make ; ) done
-+	$(MAKE) -C $$name LIB=bufr ; ) done
-+
-+test :
- 	./test.sh
- 	tables_tools/check_tables.sh bufrtables
- 
- clean   :
- 	@for name in $(SUBDIRS); do\
--	( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
-+	( echo "*** Clean in $$name ***" ;$(MAKE) -C $$name clean ); \
- 	done
- 	rm -f $(LIBRARY)
---- examples/Makefile.in.orig	2016-01-04 13:42:39.790648703 -0800
-+++ examples/Makefile.in	2016-01-04 13:45:02.384967830 -0800
-@@ -16,19 +16,19 @@
- #
- #
- TARGETS  = all clean
--EXECS    = decode_bufr decode_bufr_image bufr_decode_all tdexp tdexp create_bufr
-+EXECS    = decode_bufr decode_bufr_image bufr_decode_all bufr_compress tdexp create_bufr
- #
- #
- all :$(EXECS)
- 
--decode_bufr: decode_bufr.o 
-+decode_bufr: decode_bufr.o
- 	$(FC) $(FFLAGS) -o $@ decode_bufr.o -L$(PLACE) -l$(LIB)$(R64)
- 
--bufr_decode_all: bufr_decode_all.o 
--	$(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64) 
-+bufr_decode_all: bufr_decode_all.o
-+	$(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
- 
--bufr_compress: bufr_compress.o 
--	$(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64) 
-+bufr_compress: bufr_compress.o
-+	$(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
- 
- bufr2crex   : bufr2crex.o
- 	$(FC) $(FFLAGS) -o $@ bufr2crex.o -L$(PLACE) -l$(LIB)$(R64) -lcrex$(R64)
-@@ -48,4 +48,4 @@
- clean   :
- 	@for name in $(EXECS); do\
- 	(rm -f $$name *.o ); \
--	done 
-+	done
---- bufrtables/Makefile.orig	2016-01-04 14:03:47.292850644 -0800
-+++ bufrtables/Makefile	2016-01-04 14:05:22.242500485 -0800
-@@ -25,11 +25,14 @@
- OBJECTS      = $(OBJECTS.F) $(OBJECTS.c) 
- #
- #
--all:  links 
-+all:  pgms links
- 
- links: 
- 	./clean.sh
- 	./links.sh
-+
-+pgms: bufr2txt_tables bufr_split_tables txt2bufr_tables
-+
- bufr2txt_tables: bufr2txt_tables.f
- 	$(FC) $(FFLAGS) -o bufr2txt_tables bufr2txt_tables.f $(LIBRARY)
- bufr_split_tables: bufr_split_tables.f
diff --git a/sci-libs/libbufr/files/libbufr-makefile.patch b/sci-libs/libbufr/files/libbufr-makefile.patch
deleted file mode 100644
index bc6196245ee0..000000000000
--- a/sci-libs/libbufr/files/libbufr-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2011-03-16 22:05:18.000000000 -0700
-+++ Makefile	2011-03-16 22:05:40.000000000 -0700
-@@ -10,7 +10,7 @@
- 	( echo "*************************"; \
- 	  echo "*** Make in $$name "; \
- 	  echo "*************************"; \
--	cd $$name ; make LIB=bufr ; ) done
-+	$(MAKE) -C $$name LIB=bufr ; ) done
- 
- clean   :
- 	@for name in $(SUBDIRS); do\
diff --git a/sci-libs/libbufr/libbufr-000405.ebuild b/sci-libs/libbufr/libbufr-000405.ebuild
deleted file mode 100644
index 96df106f0f03..000000000000
--- a/sci-libs/libbufr/libbufr-000405.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fortran-2 toolchain-funcs
-
-MY_P="${PN/lib/}dc_${PV}"
-
-DESCRIPTION="ECMWF BUFR library - includes both C and Fortran example utilities"
-HOMEPAGE="https://software.ecmwf.int/wiki/display/BUFR/BUFRDC+Home"
-SRC_URI="https://software.ecmwf.int/wiki/download/attachments/35752466/${MY_P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# needs someone to test on these: ~alpha ~hppa ~ia64 ~sparc etc ...
-
-IUSE="debug doc examples lto"
-
-RDEPEND="
-	virtual/fortran
-	"
-
-DEPEND="sys-apps/findutils"
-
-S=${WORKDIR}/${MY_P}
-
-if use lto; then
-	RESTRICT="strip"
-fi
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	case "$(tc-getFC)" in
-		*gfortran)
-			export CNAME="_gfortran"
-			;;
-		*g77)
-			export CNAME="_gnu"
-			;;
-		*pgf90|*pgf77)
-			export CNAME=""
-			;;
-		ifc|ifort)
-			export CNAME="_intel"
-			;;
-	esac
-
-	elog "Note non-GNU compilers are not currently supported on non-x86"
-	elog "architectures.  If you need it, please submit a patch..."
-
-	export target="linux"
-	export A64=""
-	export R64=""
-	case "${ARCH}" in
-		amd64)
-			export R64="R64"
-			export A64="A64"
-			;;
-		ppc64)
-			export target="ppc_G5"
-			;;
-		ppc)
-			export target="ppc"
-			;;
-		*)
-			;;
-	esac
-}
-
-src_prepare() {
-	update_configs
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	local config="config/config.$target$CNAME$R64$A64"
-
-	if [[ "${ARCH}" == "ppc" ]] ; then
-		sed -i -e "s|= -mcpu=G4 -mtune=G4|= |" ${config}
-	elif [[ "${ARCH}" == "ppc64" ]] ; then
-		sed -i -e "s|= -mcpu=G5 -mtune=G5|= |" ${config}
-	else
-		cp ${config}.in ${config} || die "Error updating config!"
-	fi
-
-	sed -i -e "s:DEBUG = -O2:DEBUG = -g:g" ${config}
-	use debug || sed -i -e "s:DEBUG = -g:DEBUG =:g" ${config}
-
-	# add local CFLAGS to build flags
-	sed -i -e "s|\$(DEBUG)|${CFLAGS} \$(DEBUG) -fPIC|" \
-		-e 's|emos|/usr/share/bufrtables|g' ${config}
-
-	# add local LDFLAGS to bins
-	sed -i \
-		-e "s|-o|${LDFLAGS} -fPIC -o|" \
-		examples/Makefile \
-		bufrtables/Makefile
-}
-
-src_compile() {
-	export BUFR_TABLES="${S}"/bufrtables
-	EBUILD_ARCH="${ARCH}"
-	EBUILD_CFLAGS="${CFLAGS}"
-	unset ARCH CFLAGS
-
-	tc-export CC FC AR NM STRIP RANLIB
-	TC_FLAGS="CC=$CC FC=$FC AR=$AR RANLIB=$RANLIB"
-	ARFLAGS="rv"
-
-	if use lto; then
-		PLUGIN_PATH="--plugin=$(gcc -print-prog-name=liblto_plugin.so)"
-		tc-ld-is-gold && ARFLAGS="rv ${PLUGIN_PATH}"
-	fi
-
-	# emake won't work with this fossil...
-	BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
-	make $TC_FLAGS ARFLAGS="${ARFLAGS}" $BUFRFLAGS || die "make failed"
-
-	generate_files
-
-	ARCH="${EBUILD_ARCH}"
-	CFLAGS="${EBUILD_CFLAGS}"
-}
-
-src_test() {
-	unset ARCH CFLAGS
-	BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
-	make $BUFRFLAGS test || die "make test failed"
-
-	ARCH="${EBUILD_ARCH}"
-	CFLAGS="${EBUILD_CFLAGS}"
-}
-
-src_install() {
-	# install library
-	dolib.a libbufr$R64.a
-
-	dosbin bufrtables/{bufr2txt_tables,bufr_split_tables,txt2bufr_tables}
-	dobin examples/{bufr_decode_all,create_bufr,decode_bufr,decode_bufr_image,tdexp}
-
-	keepdir /usr/share/bufrtables
-	insinto /usr/share/bufrtables
-	doins -r bufrtables/{B,C,D}*.*
-
-	# files generated above
-	doenvd 20${PN}
-
-	dodoc README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf
-	fi
-
-	if use examples ; then
-		newdoc examples/README README.examples
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.F,*.c,Makefile}
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "This is the only GPL'd BUFR decoder library written in C/Fortran"
-	elog "but the build system is an old kluge that pre-dates the discovery"
-	elog "of fire.  File bugs as usual if you have build/runtime problems."
-	elog ""
-	elog "The default BUFR tables are stored in /usr/share/bufrtables, so"
-	elog "add your local tables there if needed.  Only a static lib is"
-	elog "installed currently, as shared lib support is incomplete (feel"
-	elog "free to submit a patch :)"
-	elog ""
-	elog "The installed user-land bufr utilities are just the examples;"
-	elog "the main library is really all there is (and there are no man"
-	elog "pages either).  Install the examples and use the source, Luke..."
-	elog
-}
-
-generate_files() {
-	## Do not remove blank lines from the response file
-	cat <<-EOF > 20${PN}
-	BUFR_TABLES="/usr/share/bufrtables"
-	EOF
-}
-
-update_configs() {
-	find . -type f -name \*.distinct -o -name \*.f -o -name \*.in \
-		 | xargs chmod -x
-	cp options/options_linux options/options_ppc
-	cp options/options_linux options/options_ppc_G5
-	cp pbio/sources.linux pbio/sources.ppc
-	cp pbio/sources.linux pbio/sources.ppc_G5
-	pushd config > /dev/null
-		cp config.ppc_gfortran.in config.ppc_gfortran
-		cp config.ppc_gfortranR64.in config.ppc_gfortranR64
-		cp config.ppc_gfortran_G5.in config.ppc_gfortran_G5
-		cp config.ppc_gfortranR64_G5.in config.ppc_gfortranR64_G5
-	popd > /dev/null
-}
diff --git a/sci-libs/libbufr/metadata.xml b/sci-libs/libbufr/metadata.xml
deleted file mode 100644
index d6a7bb3917c4..000000000000
--- a/sci-libs/libbufr/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nerdboy@gentoo.org</email>
-		<name>Steve Arnold</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-geosciences@gentoo.org</email>
-		<name>Gentoo Geosciences Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		This is mainly just an open source BUFR library from ECMWF that comes with a few example tools (some of which are built and installed).
-	</longdescription>
-	<use>
-		<flag name="lto">
-			Use gold linker and -flto (requires existing env setup)
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 4cf23af44119..f865dc10c090 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -2,3 +2,4 @@ DIST STIX_font.tgz 2450541 SHA256 6408290fd4a5267637a88507344a8f07b908ce72f46ef9
 DIST mathgl-2.1.3.1.tar.gz 5269355 SHA256 a8cb5a156b6d2828105c14c8996023df34d69c202d461a4dca1f38836d966caa SHA512 c38a4c8286f456f37b3cb928d0c6842829e24727ddc373ebce37843a2c946c2f5efbec801ed1ef46c96176bf26350a24bfbaef2e6970e75728b67c77245e5bfc WHIRLPOOL 3d4d7886e98306e0b466c3cf4f5887a5e76172627679350cee108a4fd51642384faa2c14a6375d8ebd427938f5dff3665877a8afaa09439668dd3a98686970b6
 DIST mathgl-2.1.3.tar.gz 5269347 SHA256 b091f1b91927d2b649b06785b737b0606a2d9c6b09f7ddb5a70b981c8c0af31b SHA512 aeac7a7da6846e5d4dd8a8b829bfcff359581ad1bb11c15f24824bb0ecbd9b042aab34d1ffead64a53c0ef15194a9c29d161456f7418ab18e1003d1fe2f37e73 WHIRLPOOL 9318207b12319399fb845195e96b0cf79353f1a5f9195543889b26522e56a57a7fa653e421a8591691264d9c49f78d50f684f74088e4f19eb698c91389a8b117
 DIST mathgl-2.3.3.tar.gz 20888708 SHA256 324fb8155223251f28afd3c7074d6930f09bb7a60c122c3e06af228a448d4fc9 SHA512 8cc08d547004fdeb8e049cd0e5dbdc40dc97e2178fc96c45caf26e4a5c86eb0059c80a14c0b4c079235602cebb2f8bb79640e8b075b6b262b993f28f775997d2 WHIRLPOOL e6bb68538188e440b6f64770b6d61e579a8050201b3e2bd627e6bbf190d9b962792f5469f1a2070e389289ce0367b0b458b6b0ddbde9a7479b1a03c59ffab942
+DIST mathgl-2.3.4.tar.gz 21361705 SHA256 6e93cd9f640c5b6c9dac4ca56854612d4261b4eadd6c8aad6536965195f08c02 SHA512 2ddc45750ae2373c26e199f43b7f9546e0d4540c7b11a1e6280c83632face42f50bcb8276c60b0c2208ca0b6a7506e3fc0d195a8c1aa9e774ba812643b81336d WHIRLPOOL cc7043ec2f6a84999de65ad3a5127564da3563644456d08c280d7f462dedf86e7cd5f28996f43e32300aa30adb730904c6cf6cb8f8e2c434402395af37f3ddc7
diff --git a/sci-libs/mathgl/mathgl-2.3.4.ebuild b/sci-libs/mathgl/mathgl-2.3.4.ebuild
new file mode 100644
index 000000000000..165c0d13e718
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.3.4.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0/7.4.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+	png python qt4 qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+	IUSE+=" linguas_${l}"
+done
+unset l
+
+RDEPEND="
+	!sci-visualization/udav
+	virtual/opengl
+	fltk? ( x11-libs/fltk:1 )
+	gif? ( media-libs/giflib )
+	glut? ( media-libs/freeglut )
+	gsl? ( >=sci-libs/gsl-2 )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	jpeg? ( virtual/jpeg:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	octave? ( >=sci-mathematics/octave-3.4.0 )
+	openmp? ( sys-cluster/openmpi )
+	pdf? ( media-libs/libharu )
+	png? ( media-libs/libpng:0 )
+	python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} )
+	qt4? ( dev-qt/qtgui:4 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html virtual/texi2dvi )
+	octave? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	openmp? ( !threads )
+	png? ( zlib )
+	pdf? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use mpi && export CC=mpicc CXX=mpicxx
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+	if ! [[ -d "${S}"/fonts ]]; then
+		mkdir "${S}"/fonts || die
+	fi
+	cd "${S}"/fonts || die
+	unpack STIX_font.tgz
+}
+
+src_prepare() {
+	default
+
+	# fix for location of hdf headers
+	sed -i -e 's:hdf/::g' src/data_io.cpp || die
+	# bored of reporting bad libdir upstream
+	sed -i \
+		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+		{src,widgets}/CMakeLists.txt || die
+	echo "" > lang/install.m || die
+	# fix desktop file
+	sed -i -e 's/.png//' udav/udav.desktop || die
+	# prevent sandbox violation
+	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
+	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
+	# fix missing include, bug 564204
+	sed \
+		-e '/#include <QStringList>/i #include <QObject>' \
+		-i json/Backend.hpp || die
+
+	use python && \
+		append-cppflags \
+		-I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
+	use wxwidgets && need-wxwidgets unicode
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# No clue about this option:
+		# option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
+		-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+		-DMGL_LIB_INSTALL_DIR="$(get_libdir)"
+		$(cmake-utils_use doc enable-all-docs)
+		$(cmake-utils_use fltk enable-fltk)
+		$(cmake-utils_use gif enable-gif)
+		$(cmake-utils_use glut enable-glut)
+		$(cmake-utils_use gsl enable-gsl)
+		$(cmake-utils_use hdf enable-hdf4)
+		$(cmake-utils_use hdf5 enable-hdf5_18)
+		$(cmake-utils_use jpeg enable-jpeg)
+		$(cmake-utils_use lua enable-lua)
+		$(cmake-utils_use mpi enable-mpi)
+		$(cmake-utils_use octave enable-octave)
+		$(cmake-utils_use opengl enable-opengl)
+		$(cmake-utils_use openmp enable-openmp)
+		$(cmake-utils_use pdf enable-pdf)
+		$(cmake-utils_use png enable-png)
+		$(cmake-utils_use qt4 enable-qt4)
+		$(cmake-utils_use qt5 enable-qt5)
+		$(cmake-utils_use threads enable-pthread)
+		$(cmake-utils_use threads enable-pthr-widget)
+		$(cmake-utils_use python enable-python)
+		$(cmake-utils_use wxwidgets enable-wx)
+		$(cmake-utils_use zlib enable-zlib)
+	)
+	cmake-utils_src_configure
+	# to whoever cares: TODO: do for multiple python ABI
+	if use python; then
+		sed -i \
+			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
+			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README* *.txt AUTHORS
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+	if use qt4 ; then
+		local lang
+		insinto /usr/share/udav
+		for lang in ${LANGS} ; do
+			use linguas_${lang} && doins udav/udav_${lang}.qm
+		done
+	fi
+	if use octave ; then
+		insinto /usr/share/${PN}/octave
+		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
+	fi
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if use octave; then
+		octave <<-EOF
+		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
+		EOF
+	fi
+}
+
+pkg_prerm() {
+	if use octave; then
+		octave <<-EOF
+		pkg uninstall ${PN}
+		EOF
+	fi
+}
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
new file mode 100644
index 000000000000..2d3e4d75aa7f
--- /dev/null
+++ b/sci-libs/pastix/Manifest
@@ -0,0 +1 @@
+DIST pastix_5.2.2.22.tar.bz2 2664470 SHA256 30f771a666719e6b116f549a6e4da451beabab99c2ecabc0745247c3654acbed SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70 WHIRLPOOL 7031f822d3c2f89bd520175a124200303adc2dda56cbae4eb9e011b90d5119c5b96958d648c7e18d034e2845a32ad80385714bfb424260aa62c9f6484a18ce6b
diff --git a/sci-libs/pastix/metadata.xml b/sci-libs/pastix/metadata.xml
new file mode 100644
index 000000000000..387eff2e8edd
--- /dev/null
+++ b/sci-libs/pastix/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  PaStiX (Parallel Sparse matriX package) is a scientific library that
+  provides a high performance parallel solver for very large sparse
+  linear systems based on direct methods.  Numerical algorithms are
+  implemented in single or double precision (real or complex) using
+  LLt, LDLt and LU with static pivoting (for non symmetric matrices
+  having a symmetric pattern).  This solver provides also an adaptive
+  blockwise iLU(k) factorization that can be used as a parallel
+  preconditioner using approximated supernodes to build a coarser
+  block structure of the incomplete factors.
+</longdescription>
+  <use>
+    <flag name="int64">Build the 64 bits integer library</flag>
+    <flag name="starpu">Build and link with <pkg>dev-libs/starpu</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/sci-libs/pastix/pastix-5.2.2.22.ebuild b/sci-libs/pastix/pastix-5.2.2.22.ebuild
new file mode 100644
index 000000000000..19e3f2487f39
--- /dev/null
+++ b/sci-libs/pastix/pastix-5.2.2.22.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils fortran-2 toolchain-funcs multilib
+
+# TODO:
+# testing: emake examples?
+# better doc instalation and building
+# pypastix (separate package?)
+# multilib with eselect?
+# static libs building without pic
+# metis?
+
+# commit id: change every version
+CID=
+# package id: change every version, see the link on inriaforge
+PID=35070
+# leave empty if this is not a post release bug fix
+PPV=bugfix10_
+MYPN=pastix_release
+
+DESCRIPTION="Parallel solver for very large sparse linear systems"
+HOMEPAGE="http://pastix.gforge.inria.fr"
+SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${PN}_${PV}.tar.bz2"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+#IUSE="doc int64 mpi smp starpu static-libs"
+IUSE="doc int64 mpi starpu static-libs"
+
+RDEPEND="
+	sci-libs/scotch:0=[int64?,mpi?]
+	sys-apps/hwloc:0=
+	virtual/blas
+	mpi? ( virtual/mpi )
+	starpu? ( dev-libs/starpu:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}_${PV}/src"
+
+src_prepare() {
+	sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
+		-e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
+		-e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
+		-e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \
+		-e "s:^\(MPCCPROG\s*=\).*:\1 mpicc -cc=$(tc-getCC):" \
+		-e "s:^\(MPCXXPROG\s*=\).*:\1 mpic++ -cxx=$(tc-getCXX):" \
+		-e "s:^\(MCFPROG\s*=\).*:\1 mpif90 -f90=$(tc-getFC):" \
+		-e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \
+		-e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
+		-e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
+		-e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
+		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX%/}/usr:" \
+		-e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
+		-e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
+		-e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
+		-e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \
+		-e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \
+		-e '/fPIC/s/^#//g' \
+		-e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \
+		-e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
+		-e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \
+		-e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
+		-e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \
+		-e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \
+		-e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
+		-e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \
+		-e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \
+		config/LINUX-GNU.in > config.in || die
+	sed -i -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' Makefile || die
+	default
+}
+
+src_configure() {
+	if use amd64; then
+		sed -i \
+			-e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' config.in || die
+	fi
+
+	if use int64; then
+		sed -i \
+			-e '/VERSIONINT.*_int64/s/#//' \
+			-e '/CCTYPES.*INTSSIZE64/s/#//' config.in || die
+	fi
+
+	if ! use mpi; then
+		sed -i \
+			-e '/VERSIONMPI.*_nompi/s/#//' \
+			-e '/CCTYPES.*NOMPI/s/#//' \
+			-e '/MPCCPROG\s*= $(CCPROG)/s/#//' \
+			-e '/MCFPROG\s*= $(CFPROG)/s/#//' \
+			-e 's/-DDISTRIBUTED//' \
+			-e 's/-lptscotch/-lscotch/g' \
+			config.in || die
+	fi
+
+#	if ! use smp; then
+#		sed \
+#			-e '/VERSIONSMP.*_nosmp/s/#//' \
+#			-e '/CCTYPES.*NOSMP/s/#//' \
+#			-i config.in || die
+#	fi
+
+	if use starpu; then
+		sed -i -e '/libstarpu/s/#//g' config.in || die
+	fi
+}
+
+src_compile() {
+	emake all drivers
+}
+
+src_install() {
+	default
+	sed -i -e "s:${D}::g" "${ED}"/usr/bin/pastix-conf || die
+	# quick and dirty (static libs should really be built without pic)
+	cd .. || die
+	dodoc README.txt doc/refcard/refcard.pdf
+}
diff --git a/sys-apps/baobab/baobab-3.18.1.ebuild b/sys-apps/baobab/baobab-3.18.1.ebuild
index b94ae698f3a9..783447c6da49 100644
--- a/sys-apps/baobab/baobab-3.18.1.ebuild
+++ b/sys-apps/baobab/baobab-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.40:2[dbus]
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index a4244f2bde06..2f74e5e82190 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="static"
 
 DEPEND="sys-devel/bison
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild
index 606a2f1f4211..f09f650cda90 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat gnome systemd"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31:2[dbus]
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index 57cee363f869..7a4a395f2556 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
+# Distributed under the terms of the BSD License
 # $Id$
 
 extra_started_commands="reload dump check"
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild
deleted file mode 100644
index 39c51be6fdef..000000000000
--- a/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="http://www.xinetd.org/"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="perl rpc tcpd"
-
-DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
-	rpc? ( net-libs/libtirpc:= )"
-RDEPEND="${DEPEND}
-	perl? ( dev-lang/perl )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch
-	epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch
-	epatch "${FILESDIR}"/${PN}-2.3.14-config.patch
-	find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} +
-}
-
-src_configure() {
-	if ! use rpc ; then
-		append-cppflags -DNO_RPC
-		export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
-	fi
-	tc-export AR PKG_CONFIG
-	LIBS=$(${PKG_CONFIG} --libs libtirpc) \
-	econf \
-		$(use_with tcpd libwrap) \
-		--with-loadavg
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install-contrib
-	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
-
-	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
-	newconfd "${FILESDIR}"/xinetd.confd xinetd
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
-	dodoc AUDIT INSTALL README TODO CHANGELOG
-}
diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch b/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
index 189d108814a6..9ada93d2b8fb 100644
--- a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
+++ b/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
@@ -1,10 +1,14 @@
---- src/Makefile.am	2006-12-30 01:00:22.000000000 -0600
-+++ src/Makefile.am	2006-12-30 01:01:11.000000000 -0600
+https://bugs.gentoo.org/159341
+
+fix the full path to the socket run dir
+
+--- src/Makefile.am
++++ src/Makefile.am
 @@ -20,7 +20,7 @@
  AM_CFLAGS = \
  	-DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
  	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
 -	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"
-+	-DAVAHI_SOCKET=\"$(ROOT)var/run/avahi-daemon/socket\"
++	-DAVAHI_SOCKET=\"/var/run/avahi-daemon/socket\"
  
  #AM_CFLAGS += -DNDEBUG=1 -Os
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index 4190f4031118..8f64d7f345de 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -1,4 +1,3 @@
 DIST di-4.35.tar.gz 212325 SHA256 2cdfface7a85e3a359cb228277b090a0648cabe18520e43b09919bdaf67b71d2 SHA512 5b7e7bd347b1ea285c4410e864f29cf475015a560baf450e558d3f8e1994b10822d6c3e18c04447c6a229d6d5e991194a4a3b155f3b36a8acfee866c8d048cec WHIRLPOOL 2891f70976f5818aa73ec3a07dc4afda678ae02c63b5a018cfb538a78d25f0432d70a7104ef1fe5f6e23e8e5f301430f4cc39b1538a83ea35d1a4748d4e55929
-DIST di-4.38.tar.gz 213584 SHA256 a8e721239ef16cd3645532be5788b47bd552c23491a688e06e633de10408d7f5 SHA512 a95ee5e7286ed755a4ef2e857831519f543c1432eb608fbb9dcf9cf3a979aa03e67cb765df19600149a59077c5db6c437fff61ac66e60a7b3c6160a2f59bf04f WHIRLPOOL 269e624696d7b82ade509f453fe1d26de70caa0a65095b62c7fbe4ccc13bde164dfb83076384b68ad86dcfc003b422b59032bd779e9a561ad73fb5cfb3e52177
-DIST di-4.40.tar.gz 219245 SHA256 cfff021f33cadcd8536967164ddbe2947c67b690b086b27e478540eedb002af1 SHA512 1f7aeed4f68b91dd6d2e0cfbafaa86d9b93d37c741b1087e3d9e788c34356878995485102f4018e48681925542a4814fa6245ccfa976c1c2ff406530715cde67 WHIRLPOOL fc2a6306a0c65dc16d1d3eee74630c272e4635df479b052376ea0030697dbe663c58c54cdffadf5930b8c69c7cd09430dcc90112ca19224de9048c422ef4ba3b
 DIST di-4.41.tar.gz 219347 SHA256 3ae850b160b42c3b77e42b79a4374a480eca671a83a35357078308f52f431c8b SHA512 a64eb086379d2917ec898f17ea32579f071923a2e7a729934ed649f00028c8804696f3d5ad0d10a127f8d9a669a211ec9bee0d3ba585b07996a986e9a6abe3b7 WHIRLPOOL 7c97565b75cc0af9c39bf2512da0eea2e3a43a2176e9abd73edfc744da30bf9770e88140b57100403659a0f1d3627984674d405590254f28b7af10dd55afc157
+DIST di-4.42.tar.gz 267259 SHA256 f61865a0f18de49caaa2bf40fe2ed1677a755173e9d3809111c8b668db4fd5c4 SHA512 87ac16f6a410ab7da4a68c28d9fddf4755c17233e35660d3a19bc6eb34e5e721365e5f7e8678103b9a12d85f13751d09b8854770eaedb740b4680de2e5500be4 WHIRLPOOL 4554726cd257a229d41c2969321ba12b7a516b12d3a33c3296bcc21d53e7c880fd46d801446ad9eee386f7d5cb6e12305abcda0f0b1e2f2b541c3e1925178fff
diff --git a/sys-block/di/di-4.40.ebuild b/sys-block/di/di-4.40.ebuild
deleted file mode 100644
index 42ea3cc89ab1..000000000000
--- a/sys-block/di/di-4.40.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Disk Information Utility"
-HOMEPAGE="http://www.gentoo.com/di/"
-SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test" #405205, #405471
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.33-build.patch
-}
-
-src_configure() {
-	emake checkbuild
-	emake -C C config.h
-}
-
-src_compile() {
-	emake prefix=/usr CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install prefix="${D}/usr"
-	# default symlink is broken
-	dosym di /usr/bin/mi
-	dodoc README
-}
diff --git a/sys-block/di/di-4.38.ebuild b/sys-block/di/di-4.42.ebuild
similarity index 100%
rename from sys-block/di/di-4.38.ebuild
rename to sys-block/di/di-4.42.ebuild
diff --git a/sys-block/gparted/gparted-0.25.0.ebuild b/sys-block/gparted/gparted-0.25.0.ebuild
index e1e86eea5d63..c610c5beff7d 100644
--- a/sys-block/gparted/gparted-0.25.0.ebuild
+++ b/sys-block/gparted/gparted-0.25.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
 
 # FIXME: add gpart support
diff --git a/sys-devel/autogen/autogen-5.18.4.ebuild b/sys-devel/autogen/autogen-5.18.4.ebuild
index 0fabbf911af8..8fa001bcea3f 100644
--- a/sys-devel/autogen/autogen-5.18.4.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-1.8
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 928212f14d80..c57ee9cb8a9c 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -1,2 +1,3 @@
 DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153
 DIST aufs3-standalone-3_p20160219.tar.xz 3256736 SHA256 23652c6d8fd12a9a29454293f13add7e0f97f2ec542b69e5dfecbc99064c4247 SHA512 af65cb3d9890c05ec24d64d27759d8c0fa98f35887d62a7ec77ebc496ec9de02563bc5a3e05b67c342926b062fe077c7a8de543291177a4e0210b2159027e1af WHIRLPOOL 1ed7042c9e1e8efc29fa36fcbd2f09a10ffa51cc9d6b349869f6f6947ed27399deb2fa1035df7dbaf69dcbfa7eddb6f240b934a343732ace26f77bcf2e72167a
+DIST aufs3-standalone-3_p20160223.tar.xz 3270932 SHA256 4e213e678991a028595893a2c3425894bef021cd374a6798f80ad8863bf7f593 SHA512 37805b54a2471def5948d3484349de7bfc4fee09788b36b9589aba2006484cf330bb642f27862d74a528999cf2e7fa4888b5d46b54bb3e7f8468c6857f34730f WHIRLPOOL 1e42d1a32a62b25923041b8f71b00f8ae1a8b8524752b1d796ae2fd2ada79792cbe2a35ad380e24ecad8374bbd432674763d69ffa9144dfc3074742b33d4d138
diff --git a/sys-fs/aufs3/aufs3-3_p20160223.ebuild b/sys-fs/aufs3/aufs3-3_p20160223.ebuild
new file mode 100644
index 000000000000..6e88f13f894a
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20160223.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=18
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".25+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null || die
+	unpack ${A}
+
+	cd ${PN}-standalone || die
+
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
+
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	use doc && dodoc -r Documentation
+
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index e8b933e4bb61..13c747177f71 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -1 +1,2 @@
 DIST aufs4-standalone-0_pre20160219.tar.xz 1049884 SHA256 22d0f723ff52190670da0e3dc4a3f0b81ba0b3b6f287484cf81165c6cd4b2040 SHA512 95999199ac0d430a6ab2dbda75f34d9640179865d5be3b1db119c1e613f5bd167193dd7cf662ebcea9d81ad8008d9dbd8dd835d5a7a297456f8587364e7f16b1 WHIRLPOOL a8b7a9c80c7715d0f75c9ee15e78bfbef2db11d4d9fea6ac1e8163f86b735c57b7e6a5612ac269fbcc2c483537a06c1e7704b9c3db2c7dff09b08d228ba607a1
+DIST aufs4-standalone-0_pre20160223.tar.xz 1072092 SHA256 46c9e0bb68902fb92028a435fab9d31a6193407af8c29d8ce0cdefd2e841b723 SHA512 adafd18416a43af076292ea216db73f0569f25ce34d03ebde5aea049745c47979cc4778eef8f671d48a5f7d7ac5751f788d286f467a106c6660412e88442b18e WHIRLPOOL c41763b4abb78afb291a4fbe7e1010ffc6c82a62a9d8b8b0cd23ecff65ae8f6142265f7de9f4e5ee260e0f98ca04f08881778ad7035ecde6e0c910d8a38e3be7
diff --git a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild
new file mode 100644
index 000000000000..391d3e9b7e3d
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=4
+# highest supported version
+KERN_MAX_VER=5
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
+
+	get_version
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".13+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null || die
+	unpack ${A}
+
+	cd ${PN}-standalone || die
+
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
+
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	use doc && dodoc -r Documentation
+
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 6df659adba35..8debc47da4a2 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,3 +1,3 @@
-DIST lxcfs-0.13.tar.gz 35046 SHA256 a0280b1080c95062d75fa0a3f0e743849c7cd8a88b49ff8323a665cbac75224a SHA512 bca32de4857dbcafeca0d206fd202223b35aa5918ffee9d88486cec0d7c686e9b258918204f340f666fb3ac5d382ee84706db4f5268e98c8153e4ccc5de12595 WHIRLPOOL d074d482461e8f98d55f9919eabd98cc6c015fce7f731bb99122c7b16bf40faa37a7c3ffbe2e7aa7375a0313c00e508d79863f1a60e53ab584696fe5abaec5dc
 DIST lxcfs-0.16.tar.gz 35307 SHA256 a43c303ec46f4f25b14b7973726b2dc04231a126763b9fe6e0b080d608c04086 SHA512 536b7b6109b2b9d508c37baa1e4824d0cac37eadc2c046f49db89e24adb5474d6a67410e3c0cbb970c73d2dfe7e3757a4ce08577018c2fdb787668ed31af3a03 WHIRLPOOL 718505531388f517b154aff3cca18d5526a9d18163e22e95a5cd496757f3261b2342d52f0de704d9fe7d41d5623099f3c41493cd17668fc74facf2987b27eea5
 DIST lxcfs-0.17.tar.gz 40501 SHA256 bcfe14a1ab4b717af1750b04c891a70b59f167d166c2db74984610041c926745 SHA512 dbc38265a65056330e46b8cc56558c6d14e13102c5e6c65a446749f5370c25d70a3a008d22c64b7d435c60e31bbe3efba887fd4f98c0a62fb5ad60c15366b174 WHIRLPOOL af4c0b03ede15414b53670a1363fa240986252b0ad1de8b0e13f99150ef4b2d419f63b6f96e94015344665c118c8599e1e97fb94854be89fc884ba40b96ec2c0
+DIST lxcfs-2.0.0_beta2.tar.gz 44421 SHA256 4eacbbb51031ebd0776f050d7279b2076f7b4e156503f1bbe88e034f181e1d38 SHA512 d62bccc687873c060f299a726debc4642a0900f7e7a460b5c37dcb0b5d7cb75cd5b98ee03f129ccddbe62085510e1760db73010674333536f7126d01987262f4 WHIRLPOOL 470c6118a5560ff5fd447a409d136453b423d0b27a2f00652316b9415f68e08d349fc0e75edb1d312f7a25709bf96621574bd200c8fc92808a9e4eb59aada971
diff --git a/sys-fs/lxcfs/files/lxcfs-0.13.initd b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd
old mode 100755
new mode 100644
similarity index 100%
rename from sys-fs/lxcfs/files/lxcfs-0.13.initd
rename to sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.initd
diff --git a/sys-fs/lxcfs/files/lxcfs-0.13.service b/sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service
similarity index 100%
rename from sys-fs/lxcfs/files/lxcfs-0.13.service
rename to sys-fs/lxcfs/files/lxcfs-2.0.0_beta2.service
diff --git a/sys-fs/lxcfs/lxcfs-0.13.ebuild b/sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild
similarity index 76%
rename from sys-fs/lxcfs/lxcfs-0.13.ebuild
rename to sys-fs/lxcfs/lxcfs-2.0.0_beta2.ebuild
index 24afca093d6c..f27938250bf6 100644
--- a/sys-fs/lxcfs/lxcfs-0.13.ebuild
+++ b/sys-fs/lxcfs/lxcfs-2.0.0_beta2.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
 
-inherit eutils systemd vcs-snapshot
+inherit eutils systemd vcs-snapshot versionator
 DESCRIPTION="FUSE filesystem for LXC"
 HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
 LICENSE="Apache-2.0"
@@ -17,7 +17,9 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+	# e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+	UPSTREAM_PV=$(replace_version_separator 3 '.' )
+	SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -28,6 +30,7 @@ fi
 RDEPEND="
 	dev-libs/glib:2
 	sys-fs/fuse
+	virtual/pam
 "
 DEPEND="
 	sys-apps/help2man
diff --git a/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl b/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl
new file mode 100755
index 000000000000..41c74d919d37
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/applySystemQuotas.pl
@@ -0,0 +1,104 @@
+#!/usr/bin/perl -w
+
+# $0 -b "ou=People,dc=borgia,dc=com" -F '(attr=value)'
+
+# Synopsis
+# applyQuotas.pl is a script solely for making the quota set within LDAP take
+# affect by running the linuxquota tool edquota with the figures set in LDAP.
+# This tool is capable of applying standard LDAP filters to the user-supplied
+# base DN for applying multiple users' quotas at once. 
+
+# Examples:
+# Apply the quotas using the linuxquota tool edquota for user stefan
+# ./applySystemQuotas.pl -b "uid=stefan,ou=People,dc=borgia,dc=com"
+#
+# Apply the quotas using the linuxquota tool edquota for all People with description of Student
+# ./applySystemQuotas.pl -b "ou=People,dc=borgia,dc=com" -F "(description=Student)"
+
+use strict;
+use Net::LDAP;
+use Getopt::Long;
+
+chomp(my $Password = `cat /etc/ldap.secret`);
+my $Host = 'localhost';
+my $Port = '389';
+my $BindDN = 'cn=Manager,dc=borgia,dc=com';
+my $SSL = 0;
+my $edquota_editor = '/usr/sbin/edquota_editor';
+my $edquota = '/usr/sbin/edquota';
+
+my $b = '';
+my $F = '';
+GetOptions(
+        'b=s' => \$b,
+	'F=s' => \$F,
+);
+
+die "Usage: $0 -b basedn [-F '(extrafilter)']\n" unless $b;
+
+my $ldap = connectLDAP();
+
+my $search;
+$search = $ldap->search(
+	base => $b,
+	filter => "(&(objectClass=systemQuotas)$F)",
+	attrs => ['uid', 'quota'],
+);
+$search->code && die $search->error;
+my $i = 0;
+my $max = $search->count;
+for ( $i=0; $i<$max; $i++ ) {
+	my $entry = $search->entry($i);
+	my $editor = $ENV{'VISUAL'} if $ENV{'VISUAL'};
+	$ENV{'VISUAL'} = $edquota_editor;
+	$ENV{'QUOTA_USER'} = $entry->get_value('uid');
+	# Delete all existing quotas for QUOTA_USER
+	$ENV{'QUOTA_FILESYS'} = '*';
+	$ENV{'QUOTA_SBLOCKS'} = 0;
+	$ENV{'QUOTA_HBLOCKS'} = 0;
+	$ENV{'QUOTA_SFILES'} = 0;
+	$ENV{'QUOTA_HFILES'} = 0;
+	print "$ENV{'QUOTA_USER'}: $ENV{'QUOTA_FILESYS'}:$ENV{'QUOTA_SBLOCKS'},$ENV{'QUOTA_HBLOCKS'},$ENV{'QUOTA_SFILES'},$ENV{'QUOTA_HFILES'}\n";
+	qx(/usr/sbin/edquota -u $ENV{'QUOTA_USER'});
+	my @quotas = $entry->get_value('quota');
+	if ( $#quotas >= 0 ) {
+		foreach ( @quotas ) {
+			my @quota = split /:/;
+			$ENV{'QUOTA_FILESYS'} = $quota[0];
+			$ENV{'QUOTA_SBLOCKS'} = $quota[1];
+			$ENV{'QUOTA_HBLOCKS'} = $quota[2];
+			$ENV{'QUOTA_SFILES'} = $quota[3];
+			$ENV{'QUOTA_HFILES'} = $quota[4];
+			print "$ENV{'QUOTA_USER'}: $ENV{'QUOTA_FILESYS'}:$ENV{'QUOTA_SBLOCKS'},$ENV{'QUOTA_HBLOCKS'},$ENV{'QUOTA_SFILES'},$ENV{'QUOTA_HFILES'}\n";
+			qx($edquota -u $ENV{'QUOTA_USER'});
+		}
+	}
+	if ($editor) {
+		$ENV{'VISUAL'} = $editor;
+	}
+	else {
+		delete $ENV{'VISUAL'};
+	}
+}
+$search = $ldap->unbind;
+
+sub connectLDAP {
+        # bind to a directory with dn and password
+        my $ldap = Net::LDAP->new(
+                $Host,
+                port => $Port,
+                version => 3,
+#                debug => 0xffff,
+        ) or die "Can't contact LDAP server ($@)\n";
+        if ( $SSL ) {
+                $ldap->start_tls(
+                        # verify => 'require',
+                        # clientcert => 'mycert.pem',
+                        # clientkey => 'mykey.pem',
+                        # decryptkey => sub { 'secret'; },
+                        # capath => '/usr/local/cacerts/'
+                ); 
+        }
+        $ldap->bind($BindDN, password=>$Password);
+        return $ldap;
+}   
diff --git a/sys-fs/quota/files/ldap-scripts/edquota_editor b/sys-fs/quota/files/ldap-scripts/edquota_editor
new file mode 100755
index 000000000000..fdebd09e35a4
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/edquota_editor
@@ -0,0 +1,32 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+die "QUOTA_USER environment variable not set\n" unless defined $ENV{'QUOTA_USER'};
+die "QUOTA_FILESYS environment variable not set\n" unless defined $ENV{'QUOTA_FILESYS'};
+die "QUOTA_SBLOCKS environment variable not set\n" unless defined $ENV{'QUOTA_SBLOCKS'};
+die "QUOTA_HBLOCKS environment variable not set\n" unless defined $ENV{'QUOTA_HBLOCKS'};
+die "QUOTA_SFILES environment variable not set\n" unless defined $ENV{'QUOTA_SFILES'};
+die "QUOTA_HFILES environment variable not set\n" unless defined $ENV{'QUOTA_HFILES'};
+
+open FILE, $ARGV[0];
+my $qdata = join '', (@_=<FILE>);
+close FILE;
+open FILE, ">$ARGV[0]";
+print FILE &edit_quota_file($qdata, $ENV{'QUOTA_FILESYS'}, $ENV{'QUOTA_SBLOCKS'}, $ENV{'QUOTA_HBLOCKS'}, $ENV{'QUOTA_SFILES'}, $ENV{'QUOTA_HFILES'});
+close FILE;
+
+# edit_quota_file(data, filesys, sblocks, hblocks, sfiles, hfiles)
+sub edit_quota_file {
+	my($rv, $line, @line, $i);
+	@line = split /\n/, $_[0];
+	for ( $i=0; $i<@line; $i++ ) {
+		if ($line[$i] =~ /^\s+(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/ && ($1 eq $_[1] || $_[1] eq '*')) {
+			# new-style line to change
+			$rv .= "  $1 $2 $_[2] $_[3] $5 $_[4] $_[5]\n";
+		} else {
+			$rv .= "$line[$i]\n";
+		}
+	}
+	return $rv;
+}
diff --git a/sys-fs/quota/files/ldap-scripts/quota.schema b/sys-fs/quota/files/ldap-scripts/quota.schema
new file mode 100644
index 000000000000..b5e216f8db96
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/quota.schema
@@ -0,0 +1,18 @@
+##
+## schema file for Unix Quotas
+## Schema for storing Unix Quotas in LDAP
+## OIDs are owned by Cogent Innovators, LLC
+##
+## 1.3.6.1.4.1.19937.1.1.x - attributetypes
+## 1.3.6.1.4.1.19937.1.2.x - objectclasses
+##
+
+attributetype ( 1.3.6.1.4.1.19937.1.1.1 NAME 'quota'
+	DESC 'Quotas (FileSystem:BlocksSoft,BlocksHard,InodesSoft,InodesHard)'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} )
+
+objectclass ( 1.3.6.1.4.1.19937.1.2.1 NAME 'systemQuotas' SUP posixAccount AUXILIARY
+	DESC 'System Quotas'
+	MUST ( uid )
+	MAY  ( quota ))
diff --git a/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl b/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl
new file mode 100755
index 000000000000..90ab1e8076c9
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/setSystemQuotas.pl
@@ -0,0 +1,140 @@
+#!/usr/bin/perl -w
+
+# $0 -b "ou=People,dc=borgia,dc=com" -Q /dev/with/quota=0:0:0:0 -F '(attr=value)'
+
+# Synopsis
+# setSystemQuotas.pl is a script solely for modifying the quota attribute in
+# LDAP.  It expects that the users you intend to have quotas already have the
+# systemQuotas objectClass set.
+# This tool is capable of applying standard LDAP filters to the user-supplied
+# base DN for modifying multiple users' quotas at once.
+
+# Examples:
+# Set quota on /dev/sda7 and /dev/sda8 for user stefan
+# ./setSystemQuotas.pl -b "uid=stefan,ou=People,dc=borgia,dc=com" -Q /dev/sda7=4000000:4400000:10000:11000 -Q /dev/sda8=4000000:4400000:10000:11000
+#
+# Set quota on /dev/sda8 for user all People with description of Student
+# ./setSystemQuotas.pl -b "ou=People,dc=borgia,dc=com" -Q /dev/sda8=40000:44000:1000:1100 -F "(description=Student)"
+#
+# Delete quotas for user stefan
+# ./setSystemQuotas.pl -b "uid=stefan,ou=People,dc=borgia,dc=com"
+
+use strict;
+use Net::LDAP;
+use Getopt::Long;
+
+chomp(my $Password = `cat /etc/ldap.secret`);
+my $Host = 'localhost';
+my $Port = '389';
+my $BindDN = 'cn=Manager,dc=borgia,dc=com';
+my $SSL = 0;
+
+my $b = '';
+my %Q = ();
+my $F = '';
+GetOptions(
+	'b=s' => \$b,
+	'Q=s' => \%Q,
+	'F=s' => \$F,
+);
+die "Usage: $0 -b userdn [-F '(extrafilter)'] [-Q /fs=sb:hb:sf:hf ...]\n" unless $b;
+foreach ( keys %Q ) {
+	local @_ = split /:/, $Q{$_};
+	unless ( $#_ == 3 ) {
+		print "Ignoring $_: invalid format\n";
+		delete $Q{$_};
+	}
+}
+
+my $ldap = connectLDAP();
+
+my $quota = {};
+my $search;
+$search = $ldap->search(
+        base => $b,
+        filter => "(&(objectClass=systemQuotas)$F)",
+        attrs => ['*', 'quota'],
+);
+$search->code && die $search->error;
+my $i = 0;
+my $max = $search->count;
+for ( $i=0; $i<$max; $i++ ) {
+        my $entry = $search->entry($i);
+	my $dn = $entry->dn;
+	if ( keys %Q ) {
+		$quota->{$dn} = 1;
+		foreach ( $entry->get_value('quota') ) {
+			my @quota = split /:/;
+			my $fs = shift @quota;
+			delete $quota->{$dn} if $quota->{$dn} == 1;
+			$quota->{$dn}->{$fs} = join ':', @quota;
+		}
+	} else {
+		$quota->{$dn} = 0;
+		delete $quota->{$dn} unless $entry->get_value('quota');
+	}
+}
+	
+foreach my $dn ( keys %{$quota} ) {
+	if ( ref $quota->{$dn} eq 'HASH' ) {
+print STDERR "Modify $dn:\n";
+		foreach ( keys %Q ) {
+print STDERR "\t$_:$Q{$_}\n";
+			$quota->{$dn}->{$_} = $Q{$_};
+		}
+		my @quota = map { "$_:$quota->{$dn}->{$_}" } keys %{$quota->{$dn}};
+		my $modify = $ldap->modify(
+			$dn,
+			replace => {
+				quota => [@quota],
+			},
+		);
+		$modify->code && warn "Failed to modify quota: ", $modify->error, "\n";
+	} else {
+		if ( $quota->{$dn} == 1 ) {
+			delete $quota->{$dn};
+print STDERR "Add $dn:\n";
+			foreach ( keys %Q ) {
+print STDERR "\t$_:$Q{$_}\n";
+				$quota->{$dn}->{$_} = $Q{$_}
+			}
+			my @quota = map { "$_:$quota->{$dn}->{$_}" } keys %{$quota->{$dn}};
+			my $modify = $ldap->modify(
+				$dn,
+				add => {
+					quota => [@quota],
+				},
+			);
+			$modify->code && warn "Failed to modify quota: ", $modify->error, "\n";
+		} elsif ( $quota->{$dn} == 0 ) {
+print STDERR "Delete $dn:\n";
+			my $modify = $ldap->modify(
+				$dn,
+				delete => ['quota'],
+			);
+			$modify->code && warn "Failed to modify quota: ", $modify->error, "\n";
+		}
+	}
+}
+$ldap->unbind;
+
+sub connectLDAP {
+        # bind to a directory with dn and password
+        my $ldap = Net::LDAP->new(
+                $Host,
+                port => $Port,
+                version => 3,
+#                debug => 0xffff,
+        ) or die "Can't contact LDAP server ($@)\n";
+        if ( $SSL ) {
+                $ldap->start_tls(
+                        # verify => 'require',
+                        # clientcert => 'mycert.pem',
+                        # clientkey => 'mykey.pem',
+                        # decryptkey => sub { 'secret'; },
+                        # capath => '/usr/local/cacerts/'
+                ); 
+        }
+        $ldap->bind($BindDN, password=>$Password);
+        return $ldap;
+}   
diff --git a/sys-fs/quota/files/ldap-scripts/setquota-ldap.pl b/sys-fs/quota/files/ldap-scripts/setquota-ldap.pl
new file mode 100644
index 000000000000..7cafc449d824
--- /dev/null
+++ b/sys-fs/quota/files/ldap-scripts/setquota-ldap.pl
@@ -0,0 +1,148 @@
+#!/usr/bin/perl
+
+# A Perl wrapper for setquota utility which updates LDAP accordingly.
+
+# /etc/fstab: usrquota,grpquota
+# mount -o remount /f/s
+# touch /f/s/aquota.{user,group}
+# chmod 600 /f/s/aquota.{user,group}
+# quotacheck -cguvamf
+
+use strict;
+use warnings;
+use Net::LDAP;
+use Net::LDAP::Entry;
+use Getopt::Long;
+Getopt::Long::Configure ("bundling");
+
+my $help = $#ARGV >= 0 ? 0 : 1;
+my $ldaphost = 'localhost';
+my $passwordfile = '';
+my $password = '';
+my $binddn = $ENV{BINDDN};
+my $basedn = $ENV{BASEDN};
+my $oc = 'systemQuotas';
+my $attr = 'quota';
+my %Q = ();
+my $F = 'cn=*';
+GetOptions(
+        'help|?' => \$help,
+        'oc|o=s' => \$oc,
+        'attr|a=s' => \$attr,
+        'quota|Q=s' => \%Q,
+        'filter|F=s' => \$F,
+        'ldaphost|h=s' => \$ldaphost,
+        'basedn|b=s' => \$basedn,
+        'binddn|D=s' => \$binddn,
+        'password|w=s' => \$password,
+        'passwordfile|W=s' => \$passwordfile,
+);
+die "Usage: $0 -b basedn [-o objectClass] [-a attr] [-F '(extrafilter)'] [-Q
+/f/s=sb:hb:gb:sf:hf:gf ...]\n" if $help;
+%Q = checkQ(%Q);
+
+my ($ldap, $bind);
+if ( $ldap = Net::LDAP->new($ldaphost, version => 3, timeout => 3) ) {
+        if ( $binddn && $password ) {
+                $bind = $ldap->bind($binddn, password=>$password);
+        } elsif ( $binddn && $passwordfile ){
+                $bind = $ldap->bind($binddn, password=>bindpw($passwordfile));
+        } else {
+                $bind = $ldap->bind();
+        }
+        die "Unable to connect to LDAP\n" if $bind->code;
+        undef $passwordfile;
+} else {
+        die "Unable to connect to LDAP\n";
+}
+
+my $search = $ARGV[0] ? $ldap->search(base=>$basedn, filter=>"uid=$ARGV[0]") : $ldap->search(base=>$basedn, filter=>$F);
+if ( $search->code ) {
+        die "LDAP Error: ", error($search), "\n";
+} elsif ( $search->count <= 0 ) {
+        die "0 results found in LDAP\n";
+} else {
+        my $i = 0;
+        for ( $i=0; $i<$search->count; $i++ ) {
+                my $entry = $search->entry($i);
+                my @oc = $entry->get_value('objectClass');
+                # objectClass: $oc
+                unless ( grep { /^$oc$/ } @oc ) {
+                        my $modify = $ldap->modify($entry->dn, add => {objectClass => $oc});
+                        if ( $modify->code ) {
+                                print STDERR "Failed to add objectClass $oc:", error($modify), "\n";
+                        }
+                }
+                # $attr: /f/s=sb:hb:sf:hf
+                if ( $entry->exists($attr) ) {
+                        my @attr = $entry->get_value($attr);
+                        if ( keys %Q ) {
+                                foreach my $fs ( keys %Q ) {
+                                        foreach ( @attr ) {
+                                                next unless /^$fs=/;
+                                                my $modify = $ldap->modify($entry->dn, delete => {$attr => "$_"});
+                                                if ( $modify->code ) {
+                                                        print STDERR "Failed to delete $attr: $_: ", error($modify), "\n";
+                                                }
+                                        }
+                                        my $modify = $ldap->modify($entry->dn, add => {$attr => "$fs=$Q{$fs}"});
+                                        if ( $modify->code ) {
+                                                print STDERR "Failed to add $attr: $fs=$Q{$fs}: ", error($modify), "\n";
+                                        } else {
+                                                print STDERR "Failed to setquota: $fs=$Q{$fs}\n" if setquota($entry->get_value('uid'), $fs, $Q{$fs});
+                                        }
+                                }
+                        } else {
+                                my $modify = $ldap->modify($entry->dn, delete => [($attr)]);
+                                if ( $modify->code ) {
+                                        print STDERR "Failed to delete $attr: ", error($modify), "\n";
+                                } else {
+                                        foreach ( @attr ) {
+                                                my ($fs) = m!^(/[^=]*)!;
+                                                $Q{$fs} = '0:0:0:0:0:0';
+                                                print STDERR "Failed to setquota: $fs=$Q{$fs}\n" if setquota($entry->get_value('uid'), $fs, $Q{$fs});
+                                        }
+                                }
+                        }
+                } else {
+                        if ( keys %Q ) {
+                                foreach my $fs ( keys %Q ) {
+                                        my $modify = $ldap->modify($entry->dn, add => {$attr => "$fs=$Q{$fs}"});
+                                        if ( $modify->code ) {
+                                                print STDERR "Failed to add $attr: $fs=$Q{$fs}: ", error($modify), "\n";
+                                        } else {
+                                                print STDERR "Failed to setquota: $fs=$Q{$fs}\n" if setquota($entry->get_value('uid'), $fs, $Q{$fs});
+                                        }
+                                }
+                        }
+                }
+        }
+}
+
+sub setquota {
+        $_[2] = '0:0:0:0:0:0' unless $_[2];
+        $_[2] =~ /^(\d+):(\d+):(\d+):(\d+):(\d+):(\d+)$/;
+        qx{/usr/sbin/setquota -u $_[0] $1 $2 $4 $5 $_[1]};
+        qx{/usr/sbin/setquota -T -u $_[0] $3 $6 $_[1]};
+        return 0;
+}
+
+sub checkQ {
+        my (%Q) = @_;
+        foreach ( keys %Q ) {
+                die "$_: invalid format\n" unless m!^(/[^=]*)! && $Q{$_} =~ /^(\d+):(\d+):(\d+):(\d+):(\d+):(\d+)$/;
+        }
+        return %Q;
+}
+
+sub bindpw {
+        my ($passwordfile) = @_;
+        open P, $passwordfile or die "Can't open passwordfile: $!";
+        chomp(my $password = <P>);
+        close P;
+        return $password;
+}
+
+sub error {
+        return $_[0]->error, "(", $_[0]->code, ")";
+}
diff --git a/sys-fs/quota/quota-4.03.ebuild b/sys-fs/quota/quota-4.03.ebuild
index a129780adbe3..074c8be5baf6 100644
--- a/sys-fs/quota/quota-4.03.ebuild
+++ b/sys-fs/quota/quota-4.03.ebuild
@@ -48,6 +48,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable nls) \
 		$(use_enable ldap ldapmail) \
 		$(use_enable netlink) \
@@ -74,10 +75,10 @@ src_install() {
 	if use ldap ; then
 		insinto /etc/openldap/schema
 		insopts -m0644
-		doins ldap-scripts/quota.schema
+		doins "${FILESDIR}"/ldap-scripts/quota.schema
 
 		exeinto /usr/share/quota/ldap-scripts
-		doexe ldap-scripts/*.pl
-		doexe ldap-scripts/edquota_editor
+		doexe "${FILESDIR}"/ldap-scripts/*.pl
+		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
 	fi
 }
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index be99af5d9f1d..f1aea30f7ba7 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -2,6 +2,7 @@ DIST aufs-sources-3.18.25+_p20160219.tar.xz 169620 SHA256 62e28c5f345182c324d4ba
 DIST aufs-sources-4.0_p20160219.tar.xz 168396 SHA256 16e4044f8bf83b0dbb8f6b087351de4d619f873b7023e22855f930bd2b55d10a SHA512 68cf371383250575afce395fbc368208db92b78168be31137ff9238017d40c141b29efbcbe68a850d54f8b4fa36d1556d243682a66417c67e28464b667ecd292 WHIRLPOOL 2b1008e8b76811537ed68a8b932cb488230736f3a89a815ee77cbd4d2a15a9ebaf98099fdc1aa9f084b8daad96d847e1b1decc195b5d2b0613a92512e7f9a3ef
 DIST aufs-sources-4.1.13+_p20160219.tar.xz 168840 SHA256 e4eac1836d9ad7860599b7c036168df8f2060bff834fd24dc168413c03c449bb SHA512 336da270576f83930bf338b063092e78949929ce53dcf0ad6f9d4072bba6978ff70a5b3dc1d1e358c904d49630fca9c3f82f34a9b44219ba62e30d4f8030b1e6 WHIRLPOOL 4a4530c4208ba5af675c41a0e6d61857a3cd67ca55e5f15b0a762aaec6246b480e52d43af39fa7ccb61bad651f0011cff445c0337d4e92213d7d2438e2a6fe40
 DIST aufs-sources-4.3_p20160219.tar.xz 169048 SHA256 6471c1ab669fd59f62f6d3b21ca6277c67f621ce6a362d87c2f603aa57824ad5 SHA512 b6640165c41db58ca4208cf1487d16b5fd0afc0358f3e759cd388fd952e3c7430d9e5457dd1712933e90f99d4d0baa9627d456d9d22c68db755a61bf12fa52f7 WHIRLPOOL d504577d772b5637986a0f645564b27efc0a914a265e3bde60ad0d6054e72b15ec50c6a48c9c32c1022b25614c1866509c04c6ed45852389084b063bf9abf139
+DIST aufs-sources-4.3_p20160223.tar.xz 169096 SHA256 8795ff9aa455d8e9effb980af422135d6cfd35928cc5f084e12ccd82fd13fdb4 SHA512 5e39fb0255cb6df12fafd1efa5ac9730ea29fffc9bdcfd296541821c42f34493ef59035344f6cf4ea9ccf4759f6e7dad35c162cca49864274732f868022d72f2 WHIRLPOOL 21737396487cadc0e7a13d4f87ca5464de50f18ef214512214ff5f5134d872a1f4b4822e8773e739e7f0a84ddaddfbd2eb545ed71c51b26fac8f71438aa1b657
 DIST aufs-sources-4.4_p20160219.tar.xz 168956 SHA256 f8d1b9bea2e69f73020aa43dde5b085444fbf346b68997db03a7a00140acfc2e SHA512 0da7257647838f3f7d2703ba8d8e2fb9f98a28dbdbaf4dd4f56727255759279f8774481fdb6ea7927a9b3b174056825416d7bf8e736625a98e024873f09a5933 WHIRLPOOL 5832a517fa0e231d4c1af9cb68192b7aca588a54efe34bde64260d172f0ed6c93335d577025174b9f3af50fab0ccb0973553bbab51abc29f410a3939f154deb7
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
 DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
@@ -19,6 +20,9 @@ DIST genpatches-4.1-23.extras.tar.xz 16172 SHA256 60de73d8aef3fc161d5f8fc69ea8d3
 DIST genpatches-4.3-7.base.tar.xz 137724 SHA256 f45b2b6bd27dd6ba0ce82f4b143078cdb99f729d344773ef31f42fff339f295d SHA512 3a910f0c0a41b1658190b005ca6cbfd82ddea72a65f09e26b4173371f5ff1f65a1712cd35633d0692f74fd8ff0d0fdb4163113ccca8c1de197d1ee52356fbad5 WHIRLPOOL 67611446db6eb94c59842874762797cd2986399e7304eb3adcdfd9a72b104a10dbdde7a22de87381f416ebe07ab312b80dc1a8946077a003bf5646db65aaedd9
 DIST genpatches-4.3-7.experimental.tar.xz 61640 SHA256 963f0c524dfb50dd9c8d9b211d672eeaaaa3f8fd5a1ae623dd9c4f1ad32513e0 SHA512 757630a3b74653fc9cbe0009069a3ac81eb7b989d02411234a328cb6ae4363afe5e0dfc4bd8d84828d8450951ed50a6b476d2b130f49bc32fa4251d0599b51c0 WHIRLPOOL 43fdb49d7d8fdd42775cd13c976cfc621ef879f9adaad5db971ed7f28ffdd5d8b5bb35cd0c6be3e01cbf3744ccd70f70dcc4a9fc82583c62b6e63e5c9a0415dc
 DIST genpatches-4.3-7.extras.tar.xz 16284 SHA256 11fe6eb76d8cfbda95001b05ee1c78243c7394d0a4e12600b3fbdfb69574c9b8 SHA512 503936e84af45909eb4df1b6b4968ca48cb65ed7617340270b41cfc41ad209b22a20ae63dd720901b750d905fa7215912a8c8d271c9544fbf2b3c1ca70adece5 WHIRLPOOL eb7beae6d4bd324b7b4e0daeb292891a53ba9072f30eb2c038e8b74af14643d20a577142c0fce72a36324866868582c8574700c1e86ad06aaa8ce4a7ff5fcb9d
+DIST genpatches-4.3-8.base.tar.xz 196548 SHA256 9246ac430ca198817f177093cdb628bb3eea3fad8ac0723adb38a02502cfb89a SHA512 ce2dd67fa2fba9583b9cd309d68e63b937e718cfabd9f3eb882ebc23b3139d59ff3c84beb3cf770dca367284fff6ca2bc85cf9e114da4621b7f6865b2d69dc0e WHIRLPOOL 0c5640f03d44b1219c23a7eff655b8f1749e20b30b89473c06c3a6fb0f34d30094534382ee1a1e4b5fbdffbbcce20dbe4e377410e390b8b5586ad1da9efb57fa
+DIST genpatches-4.3-8.experimental.tar.xz 61636 SHA256 8f1297df01d21d8ff121549061b8a8cfb463130edb1a873c6daba6ad8c3d7894 SHA512 19df4ca02e4552befbadef8f0824eb09cccfe10fc00e48d1e684bc7e7761f4d896e605f0153c5ad7d8f96575166c4823f08d9a5f7be3df23128b39d97a685c57 WHIRLPOOL 4d6661b13be1002d9610bbd19618d77f251f6672e286ecdd9a19fccc335ccf0c3dbc9572e60919f50b562249b9589082786762cae0b961a92f056da206b17dbc
+DIST genpatches-4.3-8.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
 DIST genpatches-4.4-4.base.tar.xz 63520 SHA256 1a682ab2279d2b57cf1575e10f70d4cd411bb209189ff9fcfd1270291f311fcf SHA512 040f590980aac0bba3805e959344f93ee9d32d4fc9e667e3cc2ab1b5375cef5043a4a0228c3fb34457af79579b96f5f587b9b0874ee066105acbe0250780c956 WHIRLPOOL 2f1bdacc234c18be10e0d3f61f3852d21cd6259d015146d7e274499f4fb9643e7e83151f3682d25c1f5a0adea507163dbcbb5e269f7f73b6e226b178a603201d
 DIST genpatches-4.4-4.experimental.tar.xz 4896 SHA256 e3c5381823db06220d1b464a8b8db3fb0efc0cae87cbe9695ccaefc956f9a17a SHA512 9ae08e11750d27a012c7b6019d14133decc14fb004d7152b83e71b0f400c3ed8bdfdf7d9f6538c8a0689efc5ff27760f79a34176275e79a99b6021a4c4db646d WHIRLPOOL 2cd692e0d14c04034f74c7742e7fea330e7a2741fc03220589d1e978e42998f4e23790e9719d38843d9dc0291f87b196ac026472a232793f10f594458c2866f4
 DIST genpatches-4.4-4.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.3.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.3.6.ebuild
new file mode 100644
index 000000000000..e908fae73d9e
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.3.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+detect_version
+detect_arch
+
+AUFS_VERSION=4.3_p20160223
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 5b37186bd33f..6238ab1cd37c 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,90 +1,47 @@
 DIST 3.10-sched-bfs-440-r1.patch 244053 SHA256 0b921d45036d411c4e04b5f6334dee3e7bfd9f131a46742aae748607a30f59d9 SHA512 c8c9f76e780f8f4c631ce161373f6a3d69ac785db080ae30d64d53b249025394d77293e074c2bed624627ecb0fb47e4745fb0676ccc2df004abf4d9f73cfc83b WHIRLPOOL 6001792a570366829d478fb5e84d33a68eff181c4a29d2ef4e2049336e1b2bf011b0d07c38c446f4acbc461a244571b78bf07b4d43a8ff1b8edb34a602917cfa
 DIST 3.14-sched-bfs-447.patch 245314 SHA256 cf71ec72daeaa1ae757e8aaea10a53f972b62548774e3c9bae95d388c7c158bb SHA512 b8ee8d42eeab19c4229a7cd391af6b732c2e8a179f5ed969f1cc8863dfed68d09a6c6e61860df103a5c9535768d8852f7ce2acdc0618b529acc98e2e33be9b0e WHIRLPOOL bfbf8b1e5c43f4908fdf8a115ce708ea68accfe9e9c8f530be43ecaca3df7abfe966164da52545f40c80fc5138e5deb152b8acb49882238899452e51d89e88ba
 DIST 3.18-sched-bfs-460.patch 250534 SHA256 f42551429eaeb544d24b658d86c24fa56acf6991b48762a48c1420d5c49baef2 SHA512 a7a6025c9062c935f024681a487d9087db9d3baf431f6534e9293174568e81f439400170f96a6060fd8b99453132e0e529eb2cd4fb795eaedda92cd8aaf65526 WHIRLPOOL e1431d93d772965139d5a67acee2c11819c5b1a09b8cfd16ecbab6c3dd086d81359b5e4be81d4bb73ef7273f495bf6c00978bae90652e1ecf1eae24f951e8f6e
-DIST 3.19-sched-bfs-461.patch 250797 SHA256 d0c8edd972a87118ea8cf37b48a6d127adce835c49228c3f3f79774675ae137a SHA512 957cdf7b41266a1209925312f3062d36f2f3be4015ef2bc11c9f3742b1b5f0b29d413d4bd24d0438e0ab36f9aa19a84ea5fb5c19ca63baf151de706e41012bdc WHIRLPOOL 9fbd6c51ade6910f6c191ddf0535d3b8b1e45f0feb76ebc3dc2735bb08b65a526b3b17647845f19abcd9bedfe47f78c643f03ef7fed42862edcacc4536709875
 DIST 3.4-sched-bfs-424.patch 238668 SHA256 0faf4dd97ed903599db83d83b79b811d171ae6d1e916ad88ca32e55290fab32d SHA512 70f788b837fb26fc03503eab15eb958f1e86ab682bba394874c75275bfa4fec225ba16df5e77bffed24afcd99d6e13c3be608c81870d4d141bd9c86cd97b64d4 WHIRLPOOL 26f65771a3bc3df5b396d66755bc9b6af5bf200f6c84bae989de0d32f806df3a581c8aea2271163fe3aca54527d34a050bea9249a3db9b9f39f17330939a81df
-DIST 4.0-sched-bfs-462.patch 252390 SHA256 0cf6fb4ec74ab142c2ad89b055340b3851b98abbac0646b1e1efacf5cd1ca320 SHA512 576f7383bc4ade80a9180859d235d5d9c273a927ffbd4b36e0d7abd223b5998d628ce2a061025c5506ecf21b57dd10cb08bf9ef40e26f7203f84c01466d98d3a WHIRLPOOL d146e6d0f4aed20922f3042792205ab666a875c9a014f35654b2abab2941cae1a163c5ae2e5284eea47c9d5d948d08b2a1cf0ecee75298899c8e3ecabbad6632
-DIST 4.1-sched-bfs-463.patch 252364 SHA256 9cc1303ee4a4cb6a4bf3da9108875a1973dc3e4ce3a72c33eda52b577978b15d SHA512 2809c0bc258461cf9d3cfae3179b2d880fae842d2ea0892358f76cb62c56f8258dfca368b5f173a9e043b508328517976110b2e81315c4a79eb5ba44f93c0133 WHIRLPOOL d6d33b85abe63da5e19afa2c6a7648f5716fcd0cc31686884bd655c0937da65d523d7d7a2ea30ebd15fc623b2300eb8aa95bc99251e22db816cdbeacaa39b0de
 DIST bfs424-grq_urwlocks.patch 26428 SHA256 2bf41081dc175776100ce8c3ac909c1a77b314903c82a73cf1b8603ad7c841c4 SHA512 9784d7382b41484623cd410a4a6cebb70aaec39076fff62622f51084b7ca59707f9790b0a53ae0cfd2974d5120c849c542346746d243c59d1d79979141cfc900 WHIRLPOOL bfb8f5ffefd8da7e72e11884833cc742cb3652c32c0022c29a2a786a43b3c9788cf34a9d5d10ed65907de4aee990766bb03c4082cae19e6ae41d22666103ba57
 DIST deblob-3.10 117299 SHA256 d48cad04fab6a802b3a3e34955c8e35b539c2441f9a62522ec5a132c3a5ae684 SHA512 7b30f0f97ed97bf6b096d4a321b4b1e62f4b48f07972f2511870c3eaaf4f3877b0c6af2f30f6b985edf9c9c79267d40448b504c59016acfe06374630d1fdcba9 WHIRLPOOL 03a5963367cc6cb4f87e3d315ab61a8b3cb1fe577b20d7e2fb6ad83464075b3ed8176f543bb4c3b4e607d78cd55ef940f446bb75be09eb7496321930413ce2b9
 DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
 DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
-DIST deblob-3.19 129098 SHA256 b0e121e80f02676bc023df1470691b94bd0495ae09aa349d1e6edddf7d1b34a2 SHA512 8f9327d5bb56fbc24f72622d579232003db95695c0cd22b4ce0b4692c9757b639c1253548d943f7cbdde9652cf51814f4b4fdf92055e8ae1c9d75acdc68d9a32 WHIRLPOOL bc3ed9eeec3ab77e2f18ec4a2a536a58b4bf2091a50219220c4d1d21de6956709c97dbb098eba64eacb2fac45f410020f6c37a3f890e6e820d5d8faebc3f3b3c
 DIST deblob-3.4 108298 SHA256 b005dd372b8e55b19fc583fd99a3e95e44844b56305fdff7fdbd5f924a6c0308 SHA512 ce3df3c4850f0da821286acfa1b6c94e16350578f76a4df93284d2fe201dd78ce15dfb5c56727d8f90012062db180d5e9ee81ac3372f5b46e0deabdcfc03ca19 WHIRLPOOL 79386c1e04ca84709fce6ec4ea5eb308876d86f04a1b28f1eda4653d4917b3b9aa9b8a6b82605da3456d29e800dd5bbfcb27c124f1a01057d25b18871bc8770d
-DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
 DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
+DIST deblob-4.3 137019 SHA256 317eb90f128fc05bcf0a01eb7f167f9b5447563b0af4cef4270b774ad64dbdf8 SHA512 e1f98cfcac9cbbe3e7042bc427c1afb5024088d0846a1eb806c7c46616ee77cbbeb63c52f7c1229ff54cda74605f9a6775833e1f5d7ba35a9ae554ca05fd7fc0 WHIRLPOOL 9d42765fd0592f7c8e01f5df78510deafbfff2b60128ad26c2412bdab4b02c72fc8dd0c7c0180176b5399de66cc85f625abf2968c049f8a3b9ebeb5d8c5c71f0
 DIST deblob-check-3.10 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
 DIST deblob-check-3.14 613905 SHA256 4c69ea1c225b1a84c41e75392dcaa94f77dd8e647aff3afe52f1ab16ac99c5e5 SHA512 4dd7e785727ce29d78f5f68431fcb6ea9dfda5221dc8e699f40d13e3c85411707b13c288d23f8baa6b3c47f5a67ac58da0a7f1a51c4d9fdda82a7428ead88cf4 WHIRLPOOL de1b67955662f072193f58b7e7dbd98c6680958c2d65632bfb831dc0681945a4d1c27abe978e6ee687ae8f48773eb71c2f9026f461377b28235e7f7e39832a67
 DIST deblob-check-3.18 654232 SHA256 30f22602b6ddf2cbccc16ef25fdc4d92755f3972e1c671d7cab8b9d6865eb155 SHA512 2cff9abef479a55dd6a0699371be8227ba63b18da1fb153d5df382e0a5e4f1b745b7de256a367a36efa9d12e2aad5622cc288efef009feebf81c108dbef4fe16 WHIRLPOOL e92927ad1565e80ce87e8bda372f8f7eb42bc0f47ad9b19fe5cf737903b2021fd6e3756e8d22b70f3037a46c254fec8b7285b37beb10795ccb4ca99d38876f8c
-DIST deblob-check-3.19 659945 SHA256 df5a9b11b095b0d8c3204c9b24118d77689900fc4ef4c3256b13fe86aee0d185 SHA512 f7fc86ebc8e1c61c16d7ce6831368832862346522676b65f4702c77bb2e9b08691f2c67cf88e92929908d5300d53913e7e5365baf3378b1cbe3aca59ec80c672 WHIRLPOOL e5e33da007c07af4ca5713d583f992d9da8c6745761e1956a246de429a44aa972a94cc1db51e67d0ba1aad9b8476ef694d846e8157a85411bcbc1809f20f633a
 DIST deblob-check-3.4 612122 SHA256 5a9552abac85cab9715a958785a3f901937fa135d85452647a16398181909c12 SHA512 c52917e9de8211f66a1e6805282dd727f1ec86701f76cbf16d0909ec212a9429c0994e0993db95b57934b17d9d91b08b4fa29f80c501397a5acce84bf4e1aed9 WHIRLPOOL d1c591fe7e229f9638945dd14f7dd16617ecff224b4cf2a6a3dd58913c23f7eb67496c26235d1d4637607bc9c9d260d990a0935b6b5bf2332f15e8ed58269856
-DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
 DIST deblob-check-4.1 674781 SHA256 54aa33e23a31ead6f982b830be86003c306b88f0d0a9f96c7dc66fe7cd274acb SHA512 51fe9d70d723992aaf70f8bfcfcc12ecfedd7a039402ddae07858fb087693b00cd80d1e0e1a5053e049f2a2b8c58ed23e4598e2dae902c4999999c08bc2eeb33 WHIRLPOOL d2c22280e12863793f8e866b126be53ee10d564373addfe9399b2afe22dd7584513c050f334ea08e6d63dd27a1574f2754456bad9d0a42e8c8d9995eec27aed0
-DIST genpatches-3.10-88.base.tar.xz 1217916 SHA256 b4037ba6e57270215f951e56f8961058a52d421cdd8ac932b95eb0fb7f5447db SHA512 2b01cc729ceedb77b5daeadd34705a5221ac9ad8fd1f920ce10b85739a5b3c67de3b76366982c8eb216932abbcb4040d4909b6f2908a3633997617987cfe2dd1 WHIRLPOOL 515def87c16a3e28dda0816695d6d8d3981232c31bc4f01df9607c9f4aabf950ad675cdc7cea1bb09e3a41101afb2bb9c48b28ae1957e3e8c206c1cb2efab052
-DIST genpatches-3.10-88.experimental.tar.xz 60188 SHA256 d779f799a398f07377f1d7cc140b3f07b43b3afdb13f94c8ef4366ba47c9f78c SHA512 abd1d1d6b4fa175c8a0e70bd57690f674e8b588e22ed18459e5433e9065336b165e404eb320dfd3e62b78978a9961c2f011aa9d758f9bdbe27b87ef008210a11 WHIRLPOOL 1667a6d965a315b7bc2b31f6d6fbad65c8c3bb66ce978c97562ad8255815eaee2b895a5bd5a8a8dbe0505e29763b8553a70ae10c7d75d853bd2af97ea3b957aa
-DIST genpatches-3.10-88.extras.tar.xz 17844 SHA256 3caee8fd80d824dbe855f52524a70c8911baf8996626eb48b82391956f39c58b SHA512 7fdd240c093e1837816358f98328cbeffdbafde8f3dedd9f31dee39d4f491cc3764dbdb30549477eb820e16ace063d6958d6fe487f4b184b96f6799ed959b95f WHIRLPOOL 9ab75dde01eb128f586d192d70cc308353f1a2cda67d949af6d955c2bbd34c4b09b0e8e1cc1c1909daca6b0006d706380806d209ba8baa4422b8edb107355778
-DIST genpatches-3.10-89.base.tar.xz 1229720 SHA256 86adf7b1a4d27a1770180410652b52d91366cbd80819b6b99794c606725b4f41 SHA512 fbb93ff58f24598db3d48125ea38b85712090b517ac7a4258d252812256cf25388bb27a18e9dd7737a61fd969609a744f6749b134035b4899c27c76af9b6d80e WHIRLPOOL 2781580b3042563b5d4958d8048796d7bce09f541d33d4f284147df0504b53e9a7c1ad71ec7c93ce06efcb3b486832d0f1c98b7444b0c6f063f077f9748c603d
-DIST genpatches-3.10-89.experimental.tar.xz 60188 SHA256 9cbcb6187fbad49c04ca926394bc725440fb6948763f5a745c7e42a947354ceb SHA512 3afc230b86653e84803cef9bb24ee2ad0d0763e42feb2fd4886810858661c6ab82110beb200370b05991fe3a630db5fcf72ae997c355db89416848b4cc9e25ec WHIRLPOOL aaa0cb729f93cced59daaa4f01e8e024189db933e78ba4d9745866f2290d9a8202d500e260c0837c5b85054173d3c03e4fbc5ea388df8ccc6030eb328abc8ff8
-DIST genpatches-3.10-89.extras.tar.xz 17832 SHA256 4f55ddccc80d9c849165929d726cd24759601db9f5c39de5f2f34413ce1f10fc SHA512 4de9603d0099e8f001721dcbf2e135e6153dba535cc1a949d7a3992d976fd6119f35c8bb026413e25f9aaa59e329e6abbaa269fb5c0278d502e37b7751b08086 WHIRLPOOL 4d33ab1225144f45c0072fc8d9a1832772ebe0b5413acc0f0827ab130148619f146fb3ef2f58ea8735ef749510d5b8408181d1a163929d4c1d6444309767b0a6
-DIST genpatches-3.10-91.base.tar.xz 1255848 SHA256 7620aefe7534b6643bcfae8a6af9d595c3b37ccd94f532e48078fe874ffe3836 SHA512 d37274bdcadadec3bc15cbe6b2477cfe6dd07aca458b52da3ff015e6cc07603c572554d80d93eaed936fe70a74a03383765b27eb4a3d37bbef8b6d2ca349c872 WHIRLPOOL 1fb71cb356f84f5c764aadf5672f7a48a42c8353499442857cf0dadd3c92dfe5adb06d134bcc67dffed45199d96c74764bd18afa9ced6b69d0e2691ef3c8ec03
-DIST genpatches-3.10-91.experimental.tar.xz 60184 SHA256 8028875798adecee5c5419ae58fef9f2c222c42b63b1bbb884a69a38b7e00a59 SHA512 1727952b1c8c9e94bc84c1d4d02f3946a8aa99498016f3258399cb08f22fd0f69245240c2252934377de30c87f755df3af19b46e9500f6b0532bc1f64be44bfa WHIRLPOOL c3e539d142cf6559ffd2aec7b9ad87bf874f5936395d5895293065d0ed63176daeacf592d1e1820e6a2f5a09c8a00d04c88026bbdf11e01c8dce7d2e3455b2d9
-DIST genpatches-3.10-91.extras.tar.xz 17836 SHA256 c0530ffe58e5b4f654224b09cde9af2b8aaa1d1644f18355c3c855b16847f2bd SHA512 709263ecc2be794c7c2e6f314625d9cf4920e6b52348160191f2589bead14a28ac8c1ec812a1fd21d86fa77acde037e9be42b49c4833e04590efa6c634ce404c WHIRLPOOL 0b3a830a1e304c39bafd28c25569051d8c3eaf79c0717aed2c4b824ab8a6a7faa284c464ee7b590ff25fb1df2f7571eea7e858827fc4cf85dda0c2216a345a23
-DIST genpatches-3.10-92.base.tar.xz 1264772 SHA256 85914172a3d7399f2f055a7f4a5547f97b8fdb215af9783a447511a152a3a9b5 SHA512 8f98ade2bae7b7cb034702d9938f105da801278f9f31dc2d8a23b65428719eb40d368f3e616b57518bcdebed76e5f278043e7401a60d64c02c6ad90fe669c46f WHIRLPOOL 81c1ddcf5f8218929bf67a31be9a141d0d1b4890bc6248704a54fa1c87357fb6e1c1131180ca7f4026d2f464a7fcac84d001ee7242356218c031bd07500f33d6
-DIST genpatches-3.10-92.experimental.tar.xz 60184 SHA256 8028875798adecee5c5419ae58fef9f2c222c42b63b1bbb884a69a38b7e00a59 SHA512 1727952b1c8c9e94bc84c1d4d02f3946a8aa99498016f3258399cb08f22fd0f69245240c2252934377de30c87f755df3af19b46e9500f6b0532bc1f64be44bfa WHIRLPOOL c3e539d142cf6559ffd2aec7b9ad87bf874f5936395d5895293065d0ed63176daeacf592d1e1820e6a2f5a09c8a00d04c88026bbdf11e01c8dce7d2e3455b2d9
-DIST genpatches-3.10-92.extras.tar.xz 17836 SHA256 c0530ffe58e5b4f654224b09cde9af2b8aaa1d1644f18355c3c855b16847f2bd SHA512 709263ecc2be794c7c2e6f314625d9cf4920e6b52348160191f2589bead14a28ac8c1ec812a1fd21d86fa77acde037e9be42b49c4833e04590efa6c634ce404c WHIRLPOOL 0b3a830a1e304c39bafd28c25569051d8c3eaf79c0717aed2c4b824ab8a6a7faa284c464ee7b590ff25fb1df2f7571eea7e858827fc4cf85dda0c2216a345a23
-DIST genpatches-3.14-52.base.tar.xz 984136 SHA256 01318999e36187e937f9108fb7b5642f05ffdf61946981cc2d3a35f2c84139ae SHA512 e691210e2ae8184e6cdbb7dd381dfa850189aa7adb58bb33f6f0c6f9cb35e04097b97ef7ec5a0806c70d4d6aa4fae39cd6fe74b04cac4aa117340bc93c785049 WHIRLPOOL f0ddafcdee7c2f7b90f2f94b859afed000d860d259fe059cb4916b1bb71ecf146c943d279ad8b00f6fcee33c0faca3fb2e0e5d9eaa69619dd1da487f2c25f583
-DIST genpatches-3.14-52.experimental.tar.xz 60316 SHA256 49f617c5ed285358514cbc6a8d5d63c76806a29f64081220797b127dad4c8cc3 SHA512 a7801b33b07d04a0bd7dd2dde5b5567ad20356a0cbce1c0ec4b58b750d54a46a8f17d380d5bfaf331798bef10fee4f35530e1597ce48b6b4376d38beb35f9f6c WHIRLPOOL 93e45f1dd19aa902e8698b514175073f062b4facc26edabef7ed47f55d26e4b9fda005d318dd69f19ab52a3760e574965b1bcd2f580ce887a6e7772a364284f1
-DIST genpatches-3.14-52.extras.tar.xz 18268 SHA256 eb8fecb29c0c64ff14f7f530ca0f4b6a414643e8bcde1e6ab2932bddc8682a63 SHA512 fbf92e198092d580fa7918725863434a784b60341e5d973d8eebc9f7b454cf25de4d362c8fd039cdafbb4a5a2782b869ca3671c1d79613294d443afb25f5d065 WHIRLPOOL c42bb5d6b6c20736af7445786a4664b4e2adad60174ff11434039db111834811d80cf71711dac6e3fe93c4a42c480752e78efe1bef62ffcb1a3cbf0549f7d93f
-DIST genpatches-3.14-54.base.tar.xz 1000384 SHA256 31496c9d1175b58ddea2e7e832cc0a1d6485754b0876bf10395de151b113bc26 SHA512 8c41346830512bedf1efa20914aa4c0a5895a78a8442e7f6749845986518a01bf0ef4d8759887b8368735c7c3cf5537717bd31ea9b2bd02c30204358a2e1adfa WHIRLPOOL 7aac6195994ca15659a7c8d73ae23fdcc0391f1a0260f795ec7c10833ef3dba90caf7fe1a8b1debcf314739515d180635e3a37721943083181a4784a8f38a30b
-DIST genpatches-3.14-54.experimental.tar.xz 60308 SHA256 d65996f339e190d74e5ec1279b7e7e50712a75c36a83d71fa030c6a91cf402d9 SHA512 a51652a814070674c106bbff39acf2a65b6f011b676a7963138ea9279fb0dfc35842efea5fbf5d02e57db53a20535edf62afdb433a31282226b3fcfb10d525f3 WHIRLPOOL a6696e0271df7ae8c4c16c1fb9450b8e3383c330967ba131e988569d67481c1d7a124094573e1522a01df8bcae0453f1a722456c637efe0531fd96b0b34e97df
-DIST genpatches-3.14-54.extras.tar.xz 18268 SHA256 082caa7769237e2105c3aedcc3be569809cdaa3dfa7a99107aaddc7f5830d5ef SHA512 8b238352a15587c7ce44ae90311b5cb7e49e05abfda5af2a777757306464316527527c2f47d81f4689acc9998d3059a3e7854b38b9ce2929de2383cdfd321d65 WHIRLPOOL d7c633218de7299be91eb3c01f5e3c5a00d348dc00612de52381ae3c4385717d9424670e8e2e0c2de94b032c50af732371f090c7189915877d6e7ef0e6896945
-DIST genpatches-3.14-56.base.tar.xz 1032792 SHA256 8f227c2a9d1c6945604b67708088484fcfeb3075a4ea984495f8b1bec5a62476 SHA512 3ed7b6b68756b7f2abbeb78e50a9735a06d4d6d5b099edfa990cc26c3894731da97df37b580d469f48f5758eab5d3aa70e4efb9300f6daacee2d8def7a918fbb WHIRLPOOL c8a55f43db1fb4a28eb87f4e5eb50d98d0c0caa76a47b06f26be0e4a2e08d8c54282a5ca46e7e89ff1c8b6d9ada44bfe319b717e76683b8fb1e68822bbb1f816
-DIST genpatches-3.14-56.experimental.tar.xz 60296 SHA256 58be5067a3830fc533800e5105aefbf6808b06258f7b64c667e8e0a59cc7eb1b SHA512 24d1b4c310bd53ff6172f69ccb73137af9d3aa6fdc5462a33afbf0e8459976b2965d3b64eace6c86f3ad05380f0b27ed3b4088177c60c2376438ee0dddbd7543 WHIRLPOOL fd90bee201267d1a4e22f6396328f8c32fc65306c30996a42721a768b13a15f91295e64e6621eddb03cbbaede55b25b50849beacd29906c46100ec8e9a6fd983
-DIST genpatches-3.14-56.extras.tar.xz 18260 SHA256 12f3e13a55a2d7cd26d12f7fd4b9f9918a58e03f1bca9db240cc2bc5f6f8dbb5 SHA512 fa64c4084b013dce25f14ce3a25a88bec3aac57f10d38b0a1871ef72d578dac6fa0613bd394bd3fda7151ad6b145285993c3e579becfac9053b59896ed7e40ef WHIRLPOOL 0ce89895abc7d3fd71a454778a996be4c08d1fc155a33ad3d2a6d6b58db050fcc87052f89dba93a2b89b7f4bc352dc0be6cdfd7698f609e47004d9e83072354f
-DIST genpatches-3.14-57.base.tar.xz 1045724 SHA256 0b68357d14cddc6349711a57b66730c45dccfc4c4598626ffc07f0949f37d286 SHA512 0610c4367e139f9b6af7ef1f5ada82ceb17cf6c53f2b2e7a95e4b44f99a279a4fe29fd1dbc597e09512c5b9c5a23ebc6091c9e62d695507044cd68adc9ae863b WHIRLPOOL 0b19e424203d24b291d5b6941b9c39800b90eac54677d2f079040eec6577c454522f83840a6e5ebd5a72743ac5f7122dc38debeaf85e757792e845355b0b32cb
-DIST genpatches-3.14-57.experimental.tar.xz 60308 SHA256 f3d49287f18f19dfdbb45c1f51d42ee63912a98568605561bfea52968f38a2b8 SHA512 781a83eb21cfa3798fe0c458e607c006cf69c7b3c3574d05e6100b5442b4b57f7b878732cdbcbca4db081aa6834c7cb7a730bbd620bb69c6f29b28e3d2ecca9a WHIRLPOOL c87d6a60449670fcaa5189be5e673e2de8dc8ea343129769fa5d33f90dda217a6d1501e7cd853f9ce6ddc836378d1514e74c7d628d98d8b0731bf205bf26b5a4
-DIST genpatches-3.14-57.extras.tar.xz 18252 SHA256 c7fab5340d2c59c203ee6b84749396b851ad5273ed9826a6305bd36823576f54 SHA512 d4d4e451713064dbc612bd33d4a8b815fe9c77a483a47eda0a35f30f159c4c538f9a7a751df2185ac7d336b80bd1297c8609980757447a3f0e3cd7491d619337 WHIRLPOOL 936d0c3a6ae981cd08d03c17d0673bbe3d706544c6bafb33a23ae1348d0fdb7ef8522333357a3b28bc5004a3062634782bda900057d8e264dbfb84f6ae032927
-DIST genpatches-3.18-16.base.tar.xz 444356 SHA256 9868f2d0a808026bbbe276193ef98a5bb65e881f6dbf347940d338e347b5a269 SHA512 6e10a76c0dbb53e82775f271dcc2077a4fa3681c92df7ed7c7d3abffcb31b19221fbf17f031e884235a62223b9a8c2ebb8c4998c1e692e3808b56c5bd7d4c1b9 WHIRLPOOL 3992b4bcf377fc4d4ba450fc7487c8be18de9bf37b49661f51a57587c2e6e4721e46c5f961a39396d7f94793fac30aa0e6a21a39ed3344b8f789fdb000d5a093
-DIST genpatches-3.18-16.experimental.tar.xz 61624 SHA256 1bab18d2a9e3995dc466533d8df2bff16ebac6170e11bf31b6c51de3170b5696 SHA512 551c1f9745f078fb5094240e7fc58fb877f6af601bff6c4dc742ecac5f0b9a1f0ec98752b7c47e56a05e2f7f9f6b79103e5ba8881ef80a5e83cd6208091307c7 WHIRLPOOL 357c25ac76680ce5a1844ce368149cb3b33eb73748b244ed6cc9d0afcdd518d643ff9c80808ac4c52871f633f104f368557c5af7e8186ae3219174ee2530bb4e
-DIST genpatches-3.18-16.extras.tar.xz 16188 SHA256 0861244845ec3dc87c5cc070ad413ac98fb435e51bc20cd41354cef8967216b9 SHA512 59b830567f423c20f0c2c8b3123c44c61ab81dae1d35f4e62a5dd291f4b34772bf5116405086228aa5ed3712721e33309d1783d2921eac49c413f7e8b4cdc5d0 WHIRLPOOL 05cc5027107bc1c0f32b3189f84432b5ccbf2ed93792709ef52859fe1cd75018714f893ffca52c675af82b88398d8c072a9cfbe1a6703fd9b7ba6ea121cdcee3
-DIST genpatches-3.18-19.base.tar.xz 591336 SHA256 346d9ce9b825e024cb448c768b9e994ef27a4693cd7eb596295f1419dd3cbca9 SHA512 5d8c4550dc8afc0687d309f586200e908d2e71ce0ec6dfc86bbe26b3437e46927a6041278b97ed2087d8aafefddbb5d6162d9e22fa566c7f9eb1e57017dad6d4 WHIRLPOOL d9f29c9dc5b3995ff59b7e4f93617ad360ecb32c6fe6702daa4826277e98ef35ca3a1fd9817cf011ba43eedc14a54ebed6134f348245fceb56298baee6b73ece
-DIST genpatches-3.18-19.experimental.tar.xz 61628 SHA256 7a34377e5c43214cc03c00e983a1996e955b3fdfc53be01ac1f84b9578c25287 SHA512 4ac764f6b11985fd63a4b392791e1a4467867ffe00f464115e8982a199cafc6a45489c704aee2a1ef9afefab93a1b110f8ccec597e6b4bf61e61f5b996d5fd36 WHIRLPOOL f2cbcf0efbe7929b0c1360b53c15bd9d6502916d664eec23aeda56e5c626d49fc2caa833e793a5a4ffed20591ff48e944ecff11c997fb5ef4aaaec066e745236
-DIST genpatches-3.18-19.extras.tar.xz 16176 SHA256 b1a797dba4a735d95a635bfd40b03e2cb83e0fedb0d50735a3eaa2cfe7898c68 SHA512 d77e4f337621b8e424f93e4433628f065895e8568f87daee82a46dfba12f7547d50edf71ece0dd9bc6356dfb9af356fc334111923c29aa61218ecf797b5bff2c WHIRLPOOL ab37e325b7be6a5a1dd9f959f9db3f46cfee3d903721c1ee1c896f66495d46ec908367cecac13a279756ab528c7f3788c90689ba717122874b430f7ec445b0fc
-DIST genpatches-3.19-9.base.tar.xz 257836 SHA256 94ca8760c25b14e705dbdc4584c78b4ba71655bcb3529c9fed3a24c41e144231 SHA512 118bd7d89bd7652ae44cd01042f865a846668ac2976f2344e9f72d6dadb4c3fdfda738e7a971656519831cbfdb6cc07a8c9b4513c88be707c3eb707d6e75a8f8 WHIRLPOOL 38df4344680cb3d38c384ac6a7ec2dfaf591cccca3795a1a1150cbf410ec4e4e8affa816c5dc3448b0310dd2b9c12e220aa6b85820fd9c68c8441ad6c2846e73
-DIST genpatches-3.19-9.experimental.tar.xz 61632 SHA256 c1668cb0ebe2c04a5f9d837cd0b42378ec9c1c53cacc4b02272462bd9e773c88 SHA512 86738abd9ce9eb007c96388a18710d8005760f5f2c36d12388af6d88cea2b60f81c2debe8d3e0af8f4ac83619a4797aa5a77b73c83adca1cbc6f397005c66561 WHIRLPOOL 8c8c5931b69a99106f38309df1367db16f6935357db1ed48a2fbeff5c266ac4801803485446d5a8a292c1c29d851c1b32dcc8ce161c6646227b9f1e75ae7621b
-DIST genpatches-3.19-9.extras.tar.xz 16280 SHA256 f0b77c7754741f000933a1450c39027c509ca66b44e78add44b100b02e415e5c SHA512 764e704d43573b80604f090b35b4c5913cc8d8abcb8f94590621df879668fdd0607db1a711a6fb24dd7b2ad709dff1110381e4b8072ad435ef7356639d8baacf WHIRLPOOL 6e8243526c27642cade7d1e9b36c6453c7a5ea63e99abae77ebd866365543930d1ee685b7a447f38e40bc8cfcbe84b01cbc8f5a6e443fe732b8e14ff3487a45d
-DIST genpatches-3.4-90.base.tar.xz 1325696 SHA256 77764d0afc0e3a9db3b4e3314c86505ed8703834f8364fabf7bc21004d14425b SHA512 df2583e5a939a2ae9a2fade243b128ad3b1d4f7370407bca15ad1dca2defde271ede16daa8c01f844053af5da7a5cfbb7ea04839fe93a4a21fe87d1d8551374f WHIRLPOOL 17050e7e73b15106fb1831290a685810e65e41a345669e401ab324a3fa27576d02cb17e22b3f8c36961b501b31254cef82d849cac005504b8feb5b4113d9cbc3
-DIST genpatches-3.4-90.extras.tar.xz 18236 SHA256 787d5a43bbadfcb40ac5f7aed21aca6bba239bcf495b0d051380f675487ecb42 SHA512 9917f83e64c0705e0c810723ada2f14109d29cee03576027fb234229796c024d8092abbb91406e2ff9594e9e1840f718885e9e0ff294cdb2bfb0ef76fbcfde0d WHIRLPOOL 255b4f46bd3f0685f6903eb04be187dfa3f821318c7bb8ae48fb17c35eabd88d0f14684f6031326cea4935246acd0766abe6e7363f1a527af686c7fa965cf9d3
-DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
-DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04
-DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085
-DIST genpatches-4.0-9.base.tar.xz 193344 SHA256 9d7c65367c1d2f24c6e4c8f8b4b9170a7ddeaa24d6563c5ba5dc41201a7b6e17 SHA512 646814e63b3b1d78adc172c6f8c0c2605cc9f368bb368be72e169049938617c5c6e738ddcfcbe1e10b58ccd3f9fa09984b03f70076ce0b15137f376594b9066a WHIRLPOOL 0eecbfe1b2b02f00edcab0c975b06bd69a5ff1032fe0c4249d79de555f92f2375d337b2417bddb566e9a1fc66859918b6cbfff6c2c73aea02818434213b0cda1
-DIST genpatches-4.0-9.experimental.tar.xz 61640 SHA256 94b3548a1154fff360c04b72e10cdd065dcba8531624b8edc3b0cbb918d22a7d SHA512 03ca661197a858e7a99419dddcab4ec1d9680652273df608d21d1df21a90dc7a59f6512a18c445e4b04fc531414bf29ed37f8f9973c3936688f8182492b4fff8 WHIRLPOOL e3018f7b855647bd6233761f9f10d9d69c0bbd138555eaa755b9964af0a1271caf64b025269d919e68f18c57fe86125a3b071c9ea1d046742fbd2cda83934401
-DIST genpatches-4.0-9.extras.tar.xz 16284 SHA256 18f2b5d62d0c9295ea28db9d589fef5f06afea2c2105f085ecf4082dd5e899d2 SHA512 69199530ddd179efa47e38cf32e39bac1819d788dc628bbc3b6cf2dd4d7149b33c0de06b304aaecb7fd92ed68f631c9638d55282174f1d1c51b8edb4dcfff336 WHIRLPOOL ac598ab6c14df8ca4a6b793abb41cddb27f6719ef5dcc4f5c7cf91b9dedabe2b2c8a19107340d1e55b3a05da2d59a99192ed81b9c666e46dbe62f7e2ebb1338d
-DIST genpatches-4.1-10.base.tar.xz 210140 SHA256 d0ac2a9175fe72d0ddf23307a9c8d06102f48220886468e4c19c92855024d829 SHA512 fadf51efbda55e959cd4636e88c2a159ed967156acbe719b15056e9e56cf01652b0ac6b515203d4821853939fe8dc4dfb6e075e55530489d5a96e44e6dfe1be7 WHIRLPOOL e384c68de2b4a4e23934cdaba6f8d02942931ea721b1730bd6e99e02547c28f6219bb6a38425c5c04bd1ee13afbf091dcb9eedadc2aca2246e05e465c07cb974
-DIST genpatches-4.1-10.experimental.tar.xz 215988 SHA256 b4ab62875339a60623db576533638e12342815ba93091d16dca7a975c10ebf4c SHA512 e51eadd26e1db63ec558fa0f4a83b8e5fb40902c9e7c96e269b4102d048b9f90defc071f42faa058605af047790bc410b2186d6c06a5fd2b8f6fe957da8cfc96 WHIRLPOOL 3061975198673a38775b78004dcdf088fd01fdc2ce784aead81425d25f6b831267e9840fee56db96253a09290ab09d01bd4fcb916b8fbe654ac32027c702d4bc
-DIST genpatches-4.1-10.extras.tar.xz 16184 SHA256 5d4492d3d535b3904fe917532b52d314bd52566832acdb1d01362e03472945da SHA512 da4163afcc52c5385ff3869105afdc0bdd021e1967b6461d3ced62bfb22ae5e9f31a4493d93ce6ab33fdb23b92df6eaef14007bc53d77de63e76802e9d65c77a WHIRLPOOL 24318d0cd07b3c3cd7d752e3619883ffcf63cec3ec7b90ba5f327bbd204e1cb2e3a7cd91c8607a988e13a23ccff25cfe8b484b8596bfe6cbf365f18e7de180e8
-DIST genpatches-4.1-7.base.tar.xz 59032 SHA256 9106e15001e0c286ef929d5e4505507ccdefb0aecdd094b73d57d587070d3288 SHA512 da1e3ef03874ab0fd3af811d6b72e791117dd7490ecbd8698e24e98424175c0ad7228182976fdadbc62a3ef69bf721f82d99cc1760417c4ba3401844fe3c8db4 WHIRLPOOL d3d3623112f118f98db870f48bc3181d6f510fdb4d916a88a832065a2e0df99c1bc5e04db6f7dd09c505f0253b76037965bbaa27103263dd95a713d0428db5ba
-DIST genpatches-4.1-7.experimental.tar.xz 214944 SHA256 1812d9b5cfa6a974cf36bb44a14bec26d021b29d386ce3139b50b99e3175143f SHA512 9704ae5529610afa2d6e62a123cba0a1891a18229a97ad5214449f23cf870e70932acd3a2ce32c5a30bd2cf89a64a012b23ee2591b699120cbffba3cb1cb0509 WHIRLPOOL cad56926d233a7b75dc4e915c1256a10864d356b6124b272f9af7eb59ae77871fd0c58ee810fdaf8d86820fdef1c0670ff7a463142cd7daa9fe9586983fc3fb9
-DIST genpatches-4.1-7.extras.tar.xz 16180 SHA256 39569583e833ff338b8126a52ae46a9a9b335d701006abbca7ed239bb84e7129 SHA512 4a5be5d19474a4679f83135ddfbb9af4b2c2c2d614ae95911c641c4d6fea8de9e25ebc1f4eefc2d9b1976c46b880e8717a0ca6987c64d2ccff969af5d6a84387 WHIRLPOOL 4509fef31139f79d7609e31d37b29f636471ba471c6ab47d6d4fcdd661b9a20d13e292b57a668b40a885a3aad4e2f831a1c3861aafbc3c85dd47f235b0ed09a6
-DIST genpatches-4.1-9.base.tar.xz 177624 SHA256 ebb16ec588dfc98222f5a5298de76e693e9d24ac8905af4b1d022b13e3fb9734 SHA512 59de6e58d054ae5b9ed096d800b8ba8323f8595f505dcae235d88deb6dba5b063239c3d2f9e08092a0c70f14d029936066765b680c44286caa2ea4f10b640bae WHIRLPOOL 1dc51a7a931a0744f824fdab9a463de7cd08127da0bd3424900c2b61f6c78feec2ae83ae4ec9558ad5a74c21e3ddd6a7b7f69c0af3b5f183671e3570c681a0c7
-DIST genpatches-4.1-9.experimental.tar.xz 214932 SHA256 7b2c86323056d3de7e6ea8674598686fe2b00eddda94f3d7dbee1ddc957d3000 SHA512 383ca9a2a92907dda40e2a76cd79880e72cea95898857d8e1a75aece590432b695cc2ec588f8f50f682bc3c36e721d6de8e22a507b10fd55c0d10210fc820831 WHIRLPOOL 9c383f81e5122064d09d181b0feaf9235069ddac5c56c8b824ca712cf3340319b3e4a090c95b46fe4343be840b921a330c32dcc521831d728597e1c93911caa3
-DIST genpatches-4.1-9.extras.tar.xz 16180 SHA256 1d4028868b4b7b5903898bda53156b068bcd8e3b7821908dbeabc4780aa4dda0 SHA512 506a3f570018fc2b6392ceddec558e980dccf292c3e119a1c5bd823c740c594f77a3fa6adc181687c658e447a9e6ea75a3a8883139a1baa5d47ee19351267b0c WHIRLPOOL df0366a4a5aac3530acc042813b643f922f84761d6c1a1a7d33a6701f03f868d9b1ba1915fb544d445df2665027652582a03336fad35c029a18f7dbc463d93e9
+DIST deblob-check-4.3 688368 SHA256 9dff222415c2ead1edba2f6755926d6786225814d87dc3624605f99a4b760a5a SHA512 2029b4765a4f83b71370dc4439526daff57be32f8692a329d500df82019a5381849ca979c0ae3761c2efcc04590c031560f0e25de50e71f476618df529a1445a WHIRLPOOL 6dbdcfe6653e751ff00ad91f45c803bdb196fdb9c895ddffaec18a111a19720d50a77485ff8ce228287217ad2e98b6f9e9c65a3c6476f195cbf9e3b7969be34a
+DIST genpatches-3.10-102.base.tar.xz 1339328 SHA256 86fa1f503db7c635d86bb9dfa61617ccc19aab486c8955a68344ecf2014520da SHA512 2bc6c3119cd4e16ebecf4f5d79769a4b0da81b60d0ca648234be146174ce5c693dadc33f022cab63b45e5b395e3e0c7fc1f57ff8d16e3636617592448a3d2cba WHIRLPOOL f111313c467967e4f56f1fa085ef030dfc53ad939a624ecdb3e2b246ecc6328cb4ee9abce124ed283f47870cdbbf0d43a1da425fbed5225aef71de2240d6eb81
+DIST genpatches-3.10-102.experimental.tar.xz 60172 SHA256 a95384e826182e9be3a70e0d7884e24abb34d3112b9c607ee35de94047d99332 SHA512 0cfaac8739e3192089d54ac795be0e78f882e74187e60170eaf7b95b60f4e218b1dabb5abe4965db8b3d2e9bc6a164fc36d8b351204ce87b190d95a394be1cd3 WHIRLPOOL c3fa228389169e256b5b253489ac8c080d236c8ea10b8b48519057ffa5ca4952ed26facfd3a936d1ed872b76d1e7769b94af072f129d07a18e90763656554ce3
+DIST genpatches-3.10-102.extras.tar.xz 17828 SHA256 e174353e2bf0ded175f756e49e86042bd6028caf7a2ecb295f7721edd051cd6b SHA512 0716e1c32548dfd764629074df0bd9f008685aff85d4bdb5b18f0cffccaad9ed331ac906206e3089a467d95d8f0fbcd87e36f441ef31585eba518852a541230f WHIRLPOOL 1bef33927aa4275f77d3ba0c5f8d5b69aa0f02a45abc28cb16b25994ffbee230505932199247d99d0bc6295e199871629d367250bd0c71bb6cdca856566be832
+DIST genpatches-3.14-68.base.tar.xz 1155456 SHA256 1ebb9070b0b2805724537a99c48d873292d8ed7b1b1a17174fba3a6ea035e64a SHA512 ab424e476ea9a91cb96b91d6547113345804426f7dbc9dd4a53d8e7dacb586bd497c3616ecc90ea59f0eed5964a4ba758afb03b61dd69ada034c350edd6e129f WHIRLPOOL b535f7cefdda9ae6d85c0969c4951efb17bfe1bec0f096854e79d2b4afc4ba23f658ba5e4332d4a8b8ee29eb32a2f976c0067618eece3b4da92f4eca6dc0a08e
+DIST genpatches-3.14-68.experimental.tar.xz 60300 SHA256 b8a435771533563dd7b9980e5970ec2f50fe6b1fef9f4350b368d256b2c17491 SHA512 60bff2845130e2be1384cfa617811f56cb981dbbfe057bf447d3bbde5567f5e61d902995a00128b3f40d5cb9274276b30ddfd04f693e103e28ffe78297fc446c WHIRLPOOL 9c71fa482160b95297f1cfeaa35538d08088a95f1fc0f5953f2bebb92535f3942a5cf1d10792831a7d48a39968fc71aaa38a96d6e8b8f4bbd0d3045c08698b36
+DIST genpatches-3.14-68.extras.tar.xz 18268 SHA256 28ccde71dae2369d818357074bedf279387e454e65cc6549e5f4b4a811216db1 SHA512 afbd8150f795d0d2a4921dea12a4d1af95e606b183f53b5a55c89b95e3b88d55bc2a879ce32e297eef7a04bd450584971ee2a1e7e262b5e3ea617a87d098af98 WHIRLPOOL df0b8e915bafdc007c4e035b5dec67b5ebc479e5f0cc9a41c54ec769f72ed69145c7fa34dd3a2987cbc86ca6f337f2b7f9071e362e85e1e22326a87afa868a5a
+DIST genpatches-3.18-28.base.tar.xz 820540 SHA256 def3cdebe118e6381465c7d61b4aeedbc55c63ffa5196f62afc40df6c1cf60d5 SHA512 dd48643fb5aa48539da83fabcc9423186e80ed7beabcb33a519eda876c5d925d910e0955f9b7d7592fbbec175a7948c11a9065a280e4f576b2618f156bbe00ec WHIRLPOOL cf7b3eb5635f0e1f7438cf87db2762471d78d2a4eb85d493ed2196c29df035ddbe6912fffe5cf126e81fbde5687aad11b1f3cae6c0d285468571ea01798fbcc0
+DIST genpatches-3.18-28.experimental.tar.xz 61612 SHA256 4ef8ff2340d16145f2177ef2f5e8ac43b37e57c9d9ac730bd0c992e99209a71e SHA512 94fd26d41de8a6a4d0ef82d9c261b3dd5b54ad58bfcf054e011f6495be788d687e589ae39e3012707cd48e836e678d237ccdd3dba6985c3f2086ae923616f2d0 WHIRLPOOL a325ec94646c9c05c33cb0338e9f3892804b1dc0277a2d80b1b1248c40f6ad6fe8de170f01639b8e79e86a9fe540ac1c8bf22c138dab85684dc76cbf7db5bbb3
+DIST genpatches-3.18-28.extras.tar.xz 16184 SHA256 7fe110961bc2fc65f0721d89af43d533a556f0ec567d84d40269549bdea089bb SHA512 5971522cdc227029414cd2b8e385dd857d7ce113c85c3bc18b575f97ac616fc1f586dbfe7a933ba4bcfff00e3c711d42b0e29289ba725c646bdee0efb4c1046f WHIRLPOOL 61d2bb69908c9458a03e25aeaabb5dc8b4129a0b8385199a51ba345a6e8af0994d60fe09e33b12e7fdf02ae83c1a31af9b7758ebf9d1c6c9e5527bee7e3e1f81
+DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f
+DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f
+DIST genpatches-4.1-23.base.tar.xz 572288 SHA256 8a46e42e2fa5e8a530bae36f330ec5e03886784228c649276e2d530b738d4f25 SHA512 176f6db507ffc7e8ccfec3c4af28a7dad4118b5b145490c4c0efa24a4b6e056cad9923aed69acf8a90a0e42626c437d54c3eac18285dca1fe7e067eea63ee178 WHIRLPOOL df45ea7924444b58b8aadeb2ceff448b29c9dc0f98b911eaf4051bbb9d18edaa283e684c2e471722f77b57d7a786a0c617108b7aa0ad72a18677153083481a36
+DIST genpatches-4.1-23.experimental.tar.xz 61656 SHA256 99f83b19eaae65c2a7f36721533e0dc229d3c319afa18a66629d1c9ba4780ca6 SHA512 4be89a9aea2269dc0d77e92921df66c429eb7bed808663a511d08cab20fded79175c6c2f8874844c2d85c77ab726459f86d3682cbcfe4604a3fdb5929a42cbd9 WHIRLPOOL 2d29b6b08edf7a34f5629f75a3d5b62be691bbf518d0482d1d92e7b15551139ca353df120fbe8c9a9ef47fed1060d19f6606aa4450ca823a39a6e9134dc40416
+DIST genpatches-4.1-23.extras.tar.xz 16172 SHA256 60de73d8aef3fc161d5f8fc69ea8d355c7876ff4a75dd30c486a8ec334f84df2 SHA512 ed74a9ab953dbacc10b6c246578c78681d36544497a296f9cf76e4e43d447b4f9a6d4354ae9074fd081e748fec0b3769b193e0ccff3953070eeeccf0ed2820ec WHIRLPOOL 6a978a5093c0258d65c511b53f42ce28ed7d19fea2f9171b5265a1050d977de9855501869a98bf5f96615bcd7b39e3522835b4876d7c5d43f80646688e5772d5
+DIST genpatches-4.3-8.base.tar.xz 196548 SHA256 9246ac430ca198817f177093cdb628bb3eea3fad8ac0723adb38a02502cfb89a SHA512 ce2dd67fa2fba9583b9cd309d68e63b937e718cfabd9f3eb882ebc23b3139d59ff3c84beb3cf770dca367284fff6ca2bc85cf9e114da4621b7f6865b2d69dc0e WHIRLPOOL 0c5640f03d44b1219c23a7eff655b8f1749e20b30b89473c06c3a6fb0f34d30094534382ee1a1e4b5fbdffbbcce20dbe4e377410e390b8b5586ad1da9efb57fa
+DIST genpatches-4.3-8.experimental.tar.xz 61636 SHA256 8f1297df01d21d8ff121549061b8a8cfb463130edb1a873c6daba6ad8c3d7894 SHA512 19df4ca02e4552befbadef8f0824eb09cccfe10fc00e48d1e684bc7e7761f4d896e605f0153c5ad7d8f96575166c4823f08d9a5f7be3df23128b39d97a685c57 WHIRLPOOL 4d6661b13be1002d9610bbd19618d77f251f6672e286ecdd9a19fccc335ccf0c3dbc9572e60919f50b562249b9589082786762cae0b961a92f056da206b17dbc
+DIST genpatches-4.3-8.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c2e56e42695730a1004266b025d91dbfa2 SHA512 3513947ec3ff2a959a92c6f45ab6482d57ddf218e9ee9af70c896bfb7773135b72eed64ba7548100acc044e8e82c9a66c3dfc34757f7ef15271be65f086947a8 WHIRLPOOL 56d8afd3b28f607c3646328822f8e24da8c57f778fd1b7af61ae4a873fc980559e072447d40f6238c95a2b96a011d0e28c78d6652a759bf32121648c5b9e1d44
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
-DIST linux-3.19.tar.xz 81688872 SHA256 be42511fe5321012bb4a2009167ce56a9e5fe362b4af43e8c371b3666859806c SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c WHIRLPOOL 76a17bb3d7c30cee19e135940f3607106efb2984061f946f0da9a2ddd602dc1bfc7e6f8970975cfb113d13f23a75415f39938204af266e2819e7a239b6f46778
 DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019171361c955639664baa0c6 SHA512 1c49b336750c9c2b49d21e54126f22a800367296be0d57e6df28b1532cbeba7fc3bdf4cfe27d9810576e76c2db2e9c2493f0804451c915137cb78d7aa61f236c WHIRLPOOL a36e62fe197ba7c08d498a79034da58091a94348f69542241067c9ebef683f86371b2c0a3b3fb6c4611e2fb885d9b74eee5c1f46a493c72dfb76c5665f0b8a6a
-DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
+DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
 DIST patch-3.10-ck1-r1.bz2 57305 SHA256 7b7835ba32c3ce1afa81139c848b7f6ec13540ba00f64ef4290c56eea52808c4 SHA512 d58dd603f02853c945d5980630e5123f7cc5fd012e0c61508cd08962cbdd4e35dfb3a6dbdd9452d8b936e6c1ec2cb552b39dc3bc6dfc29e8d020c1e2ad92825f WHIRLPOOL 322da3c72ed3641f0ec8c071dd6fe79c5a860e87a3f023df9c1fd582ed16ffaf6ba67fa93806b7545658551bbb311235dfdae8db1f09b4fb7882c79827768b11
 DIST patch-3.14-ck1.bz2 58269 SHA256 8b5924a8aa17876d394cdeb84740d96317e94d2430caddf753c416100b917d3c SHA512 d745370376e660245e0a5cc4512f0c584a4c782ddb0747637d6ec60021d95afa09d5728f44756c48843b398ba3072823bea99b1713c0833c941a522da0b6f305 WHIRLPOOL 7a9dda7e0a20b2c2ee373d957441af83f2148cfdf224ba20fe699a1f319f898493534d4b3115ed09851604760b767d2cb4c97e7f01501e0e261fa68f21937572
 DIST patch-3.18-ck1.bz2 59246 SHA256 e603c2752c160c124ae54dba8a4a9820d86912e5685b3bf6cd99705d7b147552 SHA512 c1ffbbc641cf9ef3c666a1fe5ddff1ab9ed02eb2d8d229d5ce4c11487609ef81beee456c211a658355c2061a108042929b9ad62914395a22077754ade4eb6a23 WHIRLPOOL 3562ad8e8859fa4845af99639a69cd45b73a5bcdcc3cb5bf473eeff3708c77aaf5ca6f0816e57010285bf1fdb6724d5736dc2ae74392d96cebccfd266b08d2bf
-DIST patch-3.18.14-15.xz 54756 SHA256 5d33a75024798b7842936ee61f3652a1cebbc2c4818df7f67751e942a834859d SHA512 2b7e45dcd66e6e5471d3fc81b92ea8557c3025b0d82bad7d964a1ba0e1c3912e20afb9e3cb4cf6d176986afd4d4364cf0ef043ee981076a37264334be4d8ab9f WHIRLPOOL 8c14b99d0e1909b8aa559713400e722de98217697092bc6b60a7dd51efa2e11789622d23103a6c5b9b25685b730e077b3753d1774e84324d381afdb840072a2d
-DIST patch-3.18.15-16.xz 864 SHA256 8a6d93b8737957a87a242fe25e71e87bf53d83cc028227b360316ac086e6c97a SHA512 ee99969d142c92c529cddc9521d44ced9f00eb533d3a1295c196bf74b6932ee032c6f4e0cd16697c6f378cffdbcfbdc6ceabddf23c13b2ed0b78ab9cd33df3a1 WHIRLPOOL 536b4a531f7671d4f70b8d5dceedb07a12dc8fb75b486e3cdcb6ba4d2a060bb9c16ea6b1a1dd02aa01528b1ba117117295b254a13bf2e4c6e23d1c35166b8752
-DIST patch-3.19-ck1.xz 62632 SHA256 6d3043360485bbf3b8b6b780d62ff529074489e6a4d0086607de873d1278c031 SHA512 e8d172b93597ad9023c00e07d6825ace8cb5bf421c7b8b77941262c95908dbe3129a7dfe6215dcd34b92f5e08cf7c58571b6b166aee24c1f9807fe74963b3806 WHIRLPOOL b0f8d6e56f96271499a557ad334e42c6cb6cb5f14f70579bc310e6580ad5cb2a9cd4b36f6a590ce950a2ea4360bcf5f503c0fc0c28d8876b955fee5c9c1474a7
 DIST patch-3.4-ck3.bz2 58930 SHA256 97a05793e15836866f7eabeeb08abec06dccbc23cfdd521c7e2c6c5baee20601 SHA512 f72c88f0b3570e3aa0f9c36cae5d535282c2e5aa29b3c0ac9e13db492f9df310f1fedbbcff5ea68ec872ea53c7cd968cff8e60746ccbeebb87f48a8a8a8d0c78 WHIRLPOOL 351be52877128717a40cdadf5c13aaddd688994f4654c901d905233cf41d5f0daf4aa771bf62da52d3d0acd98fcfa49234efbd0f705f4f34becd7b1ea22ddeb3
-DIST patch-4.0-ck1.bz2 59968 SHA256 be3ca32d048428a0cbd476bfe467e0d46d1848b95d4d7b70ab57b522d19f6cd2 SHA512 97f392e0bed2e6622aed7eb344f0ed499bb58ee118e62e28b67080df6ef02c7b874596e70d7db970a2f58f9f94faa3406c8a29eb5f6871ddc8d290ecd6aaf0b5 WHIRLPOOL 0efdd12ff388fdbbdcf6aacd910b27651f0834b3e8533c9a460e726c090fbaf7e926f8636f754960b54821cafcfadc665a3ad53884549ba2fe8975d76123628e
-DIST patch-4.1-ck1.bz2 60192 SHA256 d383e24325333b0045ddbfee4cfc2491ab25d9a6446094dbe0e5ad7ed3de133a SHA512 0679eab9ac50714beff50bb4551bdd01d29f3287e4438a1d88ce74ce11286dfb1ec8d2c8f07d0dd765ed3171488b52320e976e50eeb47c8da9b18ad8d7b3a233 WHIRLPOOL 7ddeb29822eaeb6cddd4e4ebf60a5fbf2f925f994627948520fe8138ae6324c62669460e823a0dcd70a181914247b7ba72bb4ff1b01a61718f4c1deb4651559b
 DIST patch-4.1-ck2.bz2 59887 SHA256 87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428 SHA512 356e144f858b6015415b2c3f781ca534e5f77b818302e404c3d3b35c088f4a4163356b67f98bfc95175bd52bd8b3e9a9a3e336cbcd8adf6c2d388700ce630d4d WHIRLPOOL 2d54fa390adefd51bab2a3253881617a76c0c808464f0d67590fa9fa52b2100987b910bedc8a6d292d1712be5369ae0b1ed492317faf36ffcb29a7a66fc3a431
+DIST patch-4.3-ck3.xz 64000 SHA256 483c12e130285cbcb49648012416323a5cb8dd8a477fa064d96c2f53019f1b31 SHA512 f13dd22d44ec51b03f9213ea7e75262197c9e9057d1acc7c2648ad802321a59b93dc2be75e402978d972dd2fa450699076cd51387ada928db93c4693ca9f960d WHIRLPOOL c1bcf18886f5a539b6a74889a78525d4bd829eced3a74bc0e15875cf656ed3b87c9320ade1cd2b94fade33431846ef9d8653430adac74d73c93736b01481770c
 DIST urw-locks.patch 7451 SHA256 09c7faed0234aabb5af6dd156eb99f2a2855b4adfec3a0a2dd9e6b6ef47d4cdd SHA512 dc5dd6f36ec8de68ad723174728df28137dbbecf81b9aca07cdeaec2d6410f42e5b5b14cd1d7fafbad44c4ab0f420db9285b3df28b990a43bc3a05327ef92e4c WHIRLPOOL 625444ada085ae324a1032e9c4d1b88376df9cd05ca613571799e96645eb58217ffd93c47d33e4ce4f0cc15eb82b572a00aee6edca93a371cf39474f54dee242
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.82.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.82.ebuild
deleted file mode 100644
index 75ea949648e7..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.10.82.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="88"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="440"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}-r1.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}-r1.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="https://dev.gentoo.org/~dlan/distfiles/${CK_FILE}
-	${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="https://dev.gentoo.org/~dlan/distfiles/${BFS_FILE}
-	${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7)--------------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.83.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.83.ebuild
deleted file mode 100644
index ca67e0ec7524..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.10.83.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="89"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="440"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}-r1.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}-r1.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="https://dev.gentoo.org/~dlan/distfiles/${CK_FILE}
-	${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="https://dev.gentoo.org/~dlan/distfiles/${BFS_FILE}
-	${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7)--------------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.87.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.87.ebuild
deleted file mode 100644
index e795126b26b5..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.10.87.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="92"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="440"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}-r1.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}-r1.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="https://dev.gentoo.org/~dlan/distfiles/${CK_FILE}
-	${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="https://dev.gentoo.org/~dlan/distfiles/${BFS_FILE}
-	${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7)--------------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.10.86.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.97.ebuild
similarity index 91%
rename from sys-kernel/ck-sources/ck-sources-3.10.86.ebuild
rename to sys-kernel/ck-sources/ck-sources-3.10.97.ebuild
index 8bc8ddd47d73..c82c40413051 100644
--- a/sys-kernel/ck-sources/ck-sources-3.10.86.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.10.97.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$
 
@@ -8,12 +8,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="bfsonly"
 
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
+	http://users.tpg.com.au/ckolivas/kernel/"
 
 K_WANT_GENPATCHES="base extras experimental"
 K_EXP_GENPATCHES_PULL="1"
 K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="91"
+K_GENPATCHES_VER="102"
 K_SECURITY_UNSUPPORTED="1"
 K_DEBLOB_AVAILABLE="1"
 
@@ -23,7 +23,7 @@ detect_arch
 
 K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
 
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
 
 #-- If Gentoo-Sources don't follow then extra incremental patches are needed -
 
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.48.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.48.ebuild
deleted file mode 100644
index 91bcd97a1bd5..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.14.48.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="54"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="447"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.50.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.50.ebuild
deleted file mode 100644
index f9c07435580f..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.14.50.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="56"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="447"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.51.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.51.ebuild
deleted file mode 100644
index 10149de8e41a..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.14.51.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="57"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="447"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.14.46.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.61.ebuild
similarity index 91%
rename from sys-kernel/ck-sources/ck-sources-3.14.46.ebuild
rename to sys-kernel/ck-sources/ck-sources-3.14.61.ebuild
index c90a3750f611..6f14fdf178ea 100644
--- a/sys-kernel/ck-sources/ck-sources-3.14.46.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.14.61.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$
 
@@ -8,12 +8,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="bfsonly"
 
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
+	http://users.tpg.com.au/ckolivas/kernel/"
 
 K_WANT_GENPATCHES="base extras experimental"
 K_EXP_GENPATCHES_PULL="1"
 K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="52"
+K_GENPATCHES_VER="68"
 K_SECURITY_UNSUPPORTED="1"
 K_DEBLOB_AVAILABLE="1"
 
@@ -23,7 +23,7 @@ detect_arch
 
 K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
 
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
 
 #-- If Gentoo-Sources don't follow then extra incremental patches are needed -
 
diff --git a/sys-kernel/ck-sources/ck-sources-3.18.16.ebuild b/sys-kernel/ck-sources/ck-sources-3.18.16.ebuild
deleted file mode 100644
index c0b968278be6..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.18.16.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="16"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN="14"
-XTRA_INCP_MAX="15"
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="460"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).xz"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.18.19.ebuild b/sys-kernel/ck-sources/ck-sources-3.18.27.ebuild
similarity index 91%
rename from sys-kernel/ck-sources/ck-sources-3.18.19.ebuild
rename to sys-kernel/ck-sources/ck-sources-3.18.27.ebuild
index f8133f22ddc7..ff06a24a4a27 100644
--- a/sys-kernel/ck-sources/ck-sources-3.18.19.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.18.27.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$
 
@@ -8,12 +8,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="bfsonly"
 
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
+	http://users.tpg.com.au/ckolivas/kernel/"
 
 K_WANT_GENPATCHES="base extras experimental"
 K_EXP_GENPATCHES_PULL="1"
 K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="19"
+K_GENPATCHES_VER="28"
 K_SECURITY_UNSUPPORTED="1"
 K_DEBLOB_AVAILABLE="1"
 
@@ -23,7 +23,7 @@ detect_arch
 
 K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
 
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
 
 #-- If Gentoo-Sources don't follow then extra incremental patches are needed -
 
diff --git a/sys-kernel/ck-sources/ck-sources-3.19.8.ebuild b/sys-kernel/ck-sources/ck-sources-3.19.8.ebuild
deleted file mode 100644
index 27a3532bfc0e..000000000000
--- a/sys-kernel/ck-sources/ck-sources-3.19.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="9"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="461"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/3.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... (3.7/3.13)---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-3.4.107.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.110.ebuild
similarity index 92%
rename from sys-kernel/ck-sources/ck-sources-3.4.107.ebuild
rename to sys-kernel/ck-sources/ck-sources-3.4.110.ebuild
index 418d6b4ee1ba..06bb20e4e42b 100644
--- a/sys-kernel/ck-sources/ck-sources-3.4.107.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.4.110.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$
 
@@ -8,10 +8,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="bfsonly experimental urwlocks"
 
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
+	http://users.tpg.com.au/ckolivas/kernel/"
 
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="90"
+K_GENPATCHES_VER="93"
 K_SECURITY_UNSUPPORTED="1"
 K_DEBLOB_AVAILABLE="1"
 
@@ -21,7 +21,7 @@ detect_arch
 
 K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
 
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
 
 #-- If Gentoo-Sources don't follow then extra incremental patches are needed -
 
diff --git a/sys-kernel/ck-sources/ck-sources-4.0.7.ebuild b/sys-kernel/ck-sources/ck-sources-4.0.7.ebuild
deleted file mode 100644
index 4ab521b8800a..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.0.7.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="9"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="462"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... ---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -------
-
-PRE_CK_FIX=""
-POST_CK_FIX="( ${FILESDIR}/bfs462-rtmn-fix.patch
-	${FILESDIR}/bfs462-update_inittask.patch )"
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.0.9.ebuild b/sys-kernel/ck-sources/ck-sources-4.0.9.ebuild
deleted file mode 100644
index 387a974d7c17..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.0.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="11"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="462"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... ---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -------
-
-PRE_CK_FIX=""
-POST_CK_FIX="( ${FILESDIR}/bfs462-rtmn-fix.patch
-	${FILESDIR}/bfs462-update_inittask.patch )"
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.1.5.ebuild b/sys-kernel/ck-sources/ck-sources-4.1.18.ebuild
similarity index 74%
rename from sys-kernel/ck-sources/ck-sources-4.1.5.ebuild
rename to sys-kernel/ck-sources/ck-sources-4.1.18.ebuild
index 80f71d6e98fb..3dedd8c0e9be 100644
--- a/sys-kernel/ck-sources/ck-sources-4.1.5.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-4.1.18.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 ETYPE="sources"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-#IUSE="bfsonly"
 
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
+	http://users.tpg.com.au/ckolivas/kernel/"
 
 K_WANT_GENPATCHES="base extras experimental"
 K_EXP_GENPATCHES_PULL="1"
 K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="9"
+K_GENPATCHES_VER="23"
 K_SECURITY_UNSUPPORTED="1"
 K_DEBLOB_AVAILABLE="1"
 
@@ -24,7 +22,7 @@ detect_arch
 
 K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
 
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
 
 #-- If Gentoo-Sources don't follow then extra incremental patches are needed -
 
@@ -34,15 +32,12 @@ XTRA_INCP_MAX=""
 #--
 
 CK_VERSION="2"
-#BFS_VERSION="464"
 
 CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-#BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
 
 CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
 CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
 CK_URI="${CK_LVER_URL}/${CK_FILE}"
-#BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
 
 #-- Build extra incremental patches list --------------------------------------
 
@@ -70,19 +65,8 @@ POST_CK_FIX=""
 #--
 
 SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI}"
-#	!bfsonly? ( ${CK_URI} )
-#	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-#if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-#else
-#	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-#fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
 
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX}"
 UNIPATCH_STRICTORDER="yes"
 
 #-- Since experimental genpatches && we want BFQ irrespective of experimental -
diff --git a/sys-kernel/ck-sources/ck-sources-4.1.3.ebuild b/sys-kernel/ck-sources/ck-sources-4.1.3.ebuild
deleted file mode 100644
index 0872594f7fbf..000000000000
--- a/sys-kernel/ck-sources/ck-sources-4.1.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-KEYWORDS="~amd64 ~x86"
-IUSE="bfsonly"
-
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
-
-K_WANT_GENPATCHES="base extras experimental"
-K_EXP_GENPATCHES_PULL="1"
-K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="7"
-K_SECURITY_UNSUPPORTED="1"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
-
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
-
-#-- If Gentoo-Sources don't follow then extra incremental patches are needed -
-
-XTRA_INCP_MIN=""
-XTRA_INCP_MAX=""
-
-#--
-
-CK_VERSION="1"
-BFS_VERSION="463"
-
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
-
-CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
-CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
-CK_URI="${CK_LVER_URL}/${CK_FILE}"
-BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
-
-#-- Build extra incremental patches list --------------------------------------
-
-LX_INCP_URI=""
-LX_INCP_LIST=""
-if [ -n "${XTRA_INCP_MIN}" ]; then
-	LX_INCP_URL="${KERNEL_BASE_URI}/incr"
-	for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do
-		LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2"
-		LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}"
-		LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}"
-	done
-fi
-
-#-- CK needs sometimes to patch itself... ---------------------------
-
-CK_INCP_URI=""
-CK_INCP_LIST=""
-
-#-- Local patches needed for the ck-patches to apply smoothly -------
-
-PRE_CK_FIX=""
-POST_CK_FIX=""
-
-#--
-
-SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI}
-	!bfsonly? ( ${CK_URI} )
-	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
-
-UNIPATCH_STRICTORDER="yes"
-
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
-
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
-
-src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
-	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
-}
-
-pkg_postinst() {
-
-	kernel-2_pkg_postinst
-
-	elog
-	elog "For more info on this patchset, see: https://forums.gentoo.org/viewtopic-t-941030-start-0.html"
-	elog
-}
diff --git a/sys-kernel/ck-sources/ck-sources-4.1.6.ebuild b/sys-kernel/ck-sources/ck-sources-4.3.6.ebuild
similarity index 71%
rename from sys-kernel/ck-sources/ck-sources-4.1.6.ebuild
rename to sys-kernel/ck-sources/ck-sources-4.3.6.ebuild
index 0d9bcf75bd05..d6c317d225e4 100644
--- a/sys-kernel/ck-sources/ck-sources-4.1.6.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-4.3.6.ebuild
@@ -1,20 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 ETYPE="sources"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-#IUSE="bfsonly"
 
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
-	http://users.on.net/~ckolivas/kernel/"
+	http://users.tpg.com.au/ckolivas/kernel/"
 
 K_WANT_GENPATCHES="base extras experimental"
 K_EXP_GENPATCHES_PULL="1"
 K_EXP_GENPATCHES_NOUSE="1"
-K_GENPATCHES_VER="10"
+K_GENPATCHES_VER="8"
 K_SECURITY_UNSUPPORTED="1"
 K_DEBLOB_AVAILABLE="1"
 
@@ -24,7 +22,7 @@ detect_arch
 
 K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
 
-DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches"
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
 
 #-- If Gentoo-Sources don't follow then extra incremental patches are needed -
 
@@ -33,16 +31,13 @@ XTRA_INCP_MAX=""
 
 #--
 
-CK_VERSION="2"
-#BFS_VERSION="464"
+CK_VERSION="3"
 
-CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2"
-#BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch"
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
 
 CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
 CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
 CK_URI="${CK_LVER_URL}/${CK_FILE}"
-#BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}"
 
 #-- Build extra incremental patches list --------------------------------------
 
@@ -70,19 +65,8 @@ POST_CK_FIX=""
 #--
 
 SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} ${CK_URI}"
-#	!bfsonly? ( ${CK_URI} )
-#	bfsonly? ( ${BFS_URI} )"
-
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-#if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-#else
-#	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-#fi
-
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
 
+UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}/${CK_FILE} ${CK_INCP_LIST} ${POST_CK_FIX}"
 UNIPATCH_STRICTORDER="yes"
 
 #-- Since experimental genpatches && we want BFQ irrespective of experimental -
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 94caf608107e..7c13b88b787e 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,3 +3,4 @@ DIST patch-4.5-rc1.xz 7967940 SHA256 e85df921d461dd39c488ddd4f14b29ce1478b3df555
 DIST patch-4.5-rc2.xz 8030184 SHA256 b5d3194bf8f22fd63cf185f1b1dd25fca65bbf562773e22b6fd2538f43cf2df6 SHA512 7c589b7ec8c9a66204b10afd6a9865c6020bce2c4d616aad1e62bf362254522846b7f60a497656631aebda052b316e1896c302faad91d9b27bc1645919c017b1 WHIRLPOOL d061e4df5f5cbf23a1532e01de670d394ef3b87c7a0566d8ccbcc80dc22fb927c7a5bdc53d625615f4aa744f5b8314388b2799a4716afaf3346d239abfbc4d65
 DIST patch-4.5-rc3.xz 8339492 SHA256 151b54060f1c1be5236f5effc8668ad1812fe2eb9bc8153ccab70cc4fa42fcf3 SHA512 ff36ea4cf4bfdc1cec10f7c5910e3741faa7ced203d917c73f90d11d9ed24a37c380daf6cac89a89c164a494590759797f3c2600058ed4e9918361eeda0e655d WHIRLPOOL 42118a11aaf2e606fc75006e6e6ee3edda369706a13e16843416abb8cdafc2c5a513b65388b01d8b93951de8c8df75bcacb4137855ddd1a9e785d3f92db4f784
 DIST patch-4.5-rc4.xz 8397260 SHA256 d3f536316fd51162a0f67013821737fb7f724f27b2574241f11ed7513d54853c SHA512 6d4ec1ccfdcbd7187535b3440f7f3c3f25585e2e9b2759d38967e56880963b0b1da4e23512d940ef603cacb1f560b613e760c9fcc4d8f96de07627894f35545f WHIRLPOOL 03c445cbc3b356a89d60d93c3b4361cd4658174c80ece3add646ff734117130690ee0e4b4c9b118520a5c933bf9aa5ff1a863a785414a4b06b294d106cd6957d
+DIST patch-4.5-rc5.xz 8430188 SHA256 2625ae21341a70c4208a380cbfac96602b44c59ec8ab6eef7e4a5a0e97528f05 SHA512 a354900d29855dc8e9a1be629f06c7ef7875764eb4cb930a826306278d9e963941eeb3c393798314bf80b415645f881c8dd2b555da808388bfe54ff7551651f3 WHIRLPOOL 057349165c0680526fa0f14dc53faefb5a999e58ad0ebe8daa0e40a193f6f0c699377483ff9547b4e3da854c46618001c66650c42d8c5d7c95ab2d630912c414
diff --git a/sys-kernel/git-sources/git-sources-4.5_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.5_rc5.ebuild
new file mode 100644
index 000000000000..cedf6831acf4
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.5_rc5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.4"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 0afc67bca2ed..d695dcf03030 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -7,12 +7,12 @@ DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
-DIST patch-3.10.96.xz 1218176 SHA256 3b4a759bb2197a22658ac5638fff9d2fbd4951f97c283d08944a4c0ad03ed39f SHA512 a414cb7e7bd5d9f205910c0c46dbe8da7597574c8f12ca517f6a6fc972d392755823f075a94e009a3b45f1398632d276f55d101055023db194b92b0f9df8ccf2 WHIRLPOOL 6fdd3134bee19d701f744915853be93bb7de865d67acb5238f797fd9c4aa8d2fd273a083dd26ec56f29c70040adbda95e2964580efec8be6db97d2f7d7e272c1
+DIST patch-3.10.97.xz 1230652 SHA256 242f7bc6212411a3d15919bebab3a6fc119e4e340b8eb4065598a5b962a3590f SHA512 b7d8967575097c0f8f608fa4aded844381b76533ebd8fcd1411788a2e0aaff1c6693d58c33b9cb4007340804e769f400396aa04219ec5cf205a9be7ad9b75cdf WHIRLPOOL f8e5bbe60d71c89a68469e837cf10e4a631c57195589a661de730b958204e2dea296e3826757a9fdae26ad1879f94620cb2f755442c981bd4f7ca5f9c4f7e67d
 DIST patch-3.12.54.xz 1439708 SHA256 c4fce8304d1f70645e23599100f0ba092d270df16a758086bed0cc662f720fb3 SHA512 c841db51a4dc9c9f7faa95045c660d8a40867eee748c2811d30011cc08a7613676636fef22160b037148102854847eb660fc8cf9e9a24a1414f18208e955a760 WHIRLPOOL 15b1f88aa6e3e13f99e530150dc55b4bb9f2516a726437e995690c2d618f1ea3cc67548b3eab49b85427af1bb4e8edf358a88d730ce58553f0fcb28642d2c9dd
-DIST patch-3.14.60.xz 1058440 SHA256 946b8c7185a0f6ac2cc87b0cb7906c2735029e76a447ace23da1444348fb3247 SHA512 333e54671404377621deac87dc980632eef00d41eb3f05f7032a26c6641b5a218e348a08e39f13c99fb1ad089668a45550c6b44f4e105356a8e83b713fdd268c WHIRLPOOL d8f4fbf46d36e5274ad8f7d2fed0b878b80be8bf2cad6310a5b3c61e5bc81a8150879971883d89570b4a962eecda3456e743a069e7e725483018b65c79f83903
+DIST patch-3.14.61.xz 1073844 SHA256 843605d381a536dbce120b3a6a363f324a9a999320b61efd931377d603bc52b7 SHA512 961bf5566289231643cbd67b04f6dc5c452ee7691f1be87c34cdcef809d1a939fd475f875bc3cee17511ad0f6fb06e45b46296197aae0e902bcb35ad7de239ef WHIRLPOOL 423806f288fdfd25c03e4dfad749d88b5fb51c5bc482502834991cb9399cfca59bcca2a16df49d1cb029e42a4ff94c724e0854beee7dc3a127eaaa805d6a9ec6
 DIST patch-3.18.27.xz 780340 SHA256 5ab0f1f24a494fc8d208d9d1efb2d7d516f99a320b05a3201fa39706fd33473e SHA512 a0ddeda9fe9905743afd3475dcb8eed6602d959afaa50684c585ba0e84a34ecd66a3cdeeebdbf61094c32b731cf3f98cd0e96904c3327ed8be20982a1bcc3208 WHIRLPOOL f75e9c2c678b4e8cb71a53b1c14774c454e4c2a941f9b597b27b09649ed8958bdef872a4b542096c9388283cd8722541acba03646ce2787c4e48c27d1e43009f
 DIST patch-3.2.77.xz 1547932 SHA256 ca1a13c650fa446d8af8eb11ae41befedea57926b1e47bb263223e16779c0920 SHA512 6d2cac1816166f1d603b1682fb39473d1f27c3a3b574d3862aa51d38451d7d44a8b7036b688b4afe3cb38fb7fc7d7dc570a5ffa36b0dfafec7decbea6d7938d1 WHIRLPOOL c060c97b5bd7441c97fc2d217a6b42df9d193d9112cb3740813b885146bf5b9ce937dead8ec0ef0f221207a104499d4515b5ab694740ad31abf9df117ab1c0f5
 DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca
 DIST patch-4.1.18.xz 547140 SHA256 c69cbff479740d6bbd452d2264ba0afefa99ae51bb7ae52bfbde348ea8d8b20c SHA512 b95b82452206c2ef19e9fb1b01dcd6880c74f1b1fb9d8e1f209add734ba342d7c65401f3a4a2101eaa6b20b653b265ebc863052de71e01fa886ff7d7b1c1ad17 WHIRLPOOL 3a47222b9349ebfe8820e79b70c50c145283a31c01d3a63b6ae08ee0a008ee85a408c44aa1711fc1dd808d9c7ccf090fee35b23abe9d85bc34650e7db39986e7
-DIST patch-4.3.5.xz 133248 SHA256 637b55eca2fe7b46cec0856bb60ce162a22b4d855e40fa0dff956561e70ce4ee SHA512 70509a0c42153c8fcad5346ddc10d1e8c92737cf36eca808e403c607fa020004d843168d774ae5f82a726ab2dae89aa866387ab157134a67c163e10d84a588a3 WHIRLPOOL 09f4005dfaa3dd7fb20ace143f1908cb922098efd98802353a9b9e6597a96c65a60e5272f1510c6bd41a6488f4ce04045004558da4917be1e5ca9a4fd43e9ee2
-DIST patch-4.4.1.xz 23612 SHA256 c0218043e61da3921cd14579ae4a8774a6fdad91667a9fdb851d0a35f62edb48 SHA512 b117b6f88dd713a33691306e483d5c42bcf61091d91f7248e1537ac7f7b96380f5f7df81f399cecda13d9388ad7aa52ed2e6d46f7b27706d2f197b8e64c330b3 WHIRLPOOL 988a5cd6fc39577eda1baae93fda94deab93fa6d5245aa90f3c6ae032151b1a9e23458ee822d558643f23e0aabf1bd5962d36a72180a04bcecba74287ace776a
+DIST patch-4.3.6.xz 190488 SHA256 a68b16b1f6841e2be6d492c8502cb0d0a709097b55c400ad7d90b60fa4355d6b SHA512 d0b8c278a0c7b4e829d4e98884d9c2ed6cbc4bbd6e21f3d7b6fc0f1e50a267ad871a0b82723fc4bc5e560748af4ba07e8af8f9c28a0b01307d8e6f8fcdbff0d7 WHIRLPOOL bc0323e041c666243312737b0eee284636d783acbdf36ee2ba831fa9a20396a386a772f0a2e2a41efec1df802fa241f77cf5a6e6ece04962c8389e209469c833
+DIST patch-4.4.2.xz 60144 SHA256 5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c SHA512 3222ddc913d14cd4b4ae999890afb580db9a79337dcd42876db6bbf08d351982bb1849fd97152915b570a3408ddd2be645e851736615f90ad8354244116ae12c WHIRLPOOL 3ca5d83d1a02d41e311a88a8b7e6df59586ebfd49528640e9716a3470bb88c6f02f1c79a054b3d8b246fade3a4ef248bc580b5dd7891d68cd6848c140e56a473
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.96.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.97.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.10.96.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.10.97.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.14.60.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.14.61.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-3.14.60.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-3.14.61.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.3.5.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.3.6.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.3.5.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.3.6.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.1.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.2.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.1.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.2.ebuild
diff --git a/sys-libs/libosinfo/libosinfo-0.3.0.ebuild b/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
index 22316c4d9ec1..53dacd5634ef 100644
--- a/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection +vala test"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2:2
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index a4d38038c3f9..ffea79c0fed2 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -1 +1,2 @@
 DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c
+DIST musl-1.1.14.tar.gz 894971 SHA256 35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5 SHA512 9016246b44a7e6ef51477f0a246373c79f3e796c70031c3323be1b6c4c0518a2d4578f1aa712adfd9a80cdc1d71918bd7a35855052a0452b854755bf0cc2424e WHIRLPOOL e675ed13888021376812c65addf245906bfca00c5291ca5979cb4894cbe72b3a1b69c0fd793bd49f9cef2154131f717b15b52398b43c68fcfb7c5530b1258e72
diff --git a/sys-libs/musl/musl-1.1.14.ebuild b/sys-libs/musl/musl-1.1.14.ebuild
new file mode 100644
index 000000000000..98e65f4623af
--- /dev/null
+++ b/sys-libs/musl/musl-1.1.14.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-r3
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
+	KEYWORDS="-* amd64 arm ~mips ppc x86"
+fi
+
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="crosscompile_opts_headers-only"
+
+RDEPEND="!sys-apps/getent"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use crosscompile_opts_headers-only && is_crosscompile
+}
+
+musl_endian() {
+	# XXX: this wont work for bi-endian, but we dont have any
+	touch "${T}"/endian.s || die
+	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
+	case $(file "${T}"/endian.o) in
+		*" MSB "*) echo "";;
+		*" LSB "*) echo "el";;
+		*)         echo "nfc";; # We shouldn't be here
+	esac
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local target=$(tc-arch) arch
+		local endian=$(musl_endian)
+		case ${target} in
+			amd64) arch="x86_64";;
+			arm)   arch="armhf";; # We only have hardfloat right now
+			mips)  arch="mips${endian}";;
+			ppc)   arch="powerpc";;
+			x86)   arch="i386";;
+		esac
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${FILESDIR}"/getent
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		doenvd "${T}"/00musl || die
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig
+	# reload init ...
+	/sbin/telinit U 2>/dev/null
+}
diff --git a/virtual/python-imaging/ChangeLog-2015 b/virtual/python-imaging/ChangeLog-2015
deleted file mode 100644
index 68e8bb2f87a3..000000000000
--- a/virtual/python-imaging/ChangeLog-2015
+++ /dev/null
@@ -1,61 +0,0 @@
-# ChangeLog for virtual/python-imaging
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/python-imaging/ChangeLog,v 1.16 2015/04/08 18:31:14 mgorny Exp $
-
-  08 Apr 2015; Michał Górny <mgorny@gentoo.org> python-imaging-2.ebuild:
-  Drop old Python implementations
-
-  06 Jul 2014; Mike Gilbert <floppym@gentoo.org> -python-imaging-0.ebuild,
-  -python-imaging-1.ebuild, python-imaging-2.ebuild:
-  Remove old/broken ebuilds.
-
-  23 Jun 2014; Tobias Klausmann <klausman@gentoo.org> python-imaging-2.ebuild:
-  Stable on alpha, bug #486326
-
-  03 Jun 2014; Jeroen Roovers <jer@gentoo.org> python-imaging-2.ebuild:
-  Stable for HPPA (bug #486326).
-
-  12 May 2014; Ian Delaney <idella4@gentoo.org> python-imaging-2.ebuild:
-  add pypy support
-
-  25 Apr 2014; Ian Delaney <idella4@gentoo.org> python-imaging-2.ebuild:
-  add py3.4 support
-
-  16 Feb 2014; Mike Frysinger <vapier@gentoo.org> python-imaging-2.ebuild:
-  Mark arm stable.
-
-  25 Jan 2014; Mike Gilbert <floppym@gentoo.org> python-imaging-0.ebuild,
-  python-imaging-1.ebuild, python-imaging-2.ebuild:
-  Add jpeg use flag.
-
-  29 Dec 2013; Akinori Hattori <hattya@gentoo.org> python-imaging-2.ebuild:
-  ia64 stable wrt bug #486326
-
-  23 Oct 2013; Agostino Sarubbo <ago@gentoo.org> python-imaging-2.ebuild:
-  Stable for ppc64, wrt bug #488048
-
-  22 Oct 2013; Agostino Sarubbo <ago@gentoo.org> python-imaging-2.ebuild:
-  Stable for ppc, wrt bug #488048
-
-*python-imaging-2 (09 Sep 2013)
-
-  09 Sep 2013; Mike Gilbert <floppym@gentoo.org> +python-imaging-2.ebuild:
-  Drop dev-python/imaging from deps; portage seems to get confused by the || dep
-  in some cases.
-
-  05 Sep 2013; Michał Górny <mgorny@gentoo.org> python-imaging-1.ebuild:
-  Drop stale conditionals after py2.5 removal.
-
-  10 Jun 2013; Mike Gilbert <floppym@gentoo.org> python-imaging-1.ebuild:
-  Add a required use constraint to make the situation with python2.5 and python3
-  more clear.
-
-  09 Jun 2013; Mike Gilbert <floppym@gentoo.org> python-imaging-1.ebuild:
-  Stabilize for amd64 and x86.
-
-*python-imaging-1 (01 Jun 2013)
-*python-imaging-0 (01 Jun 2013)
-
-  01 Jun 2013; Mike Gilbert <floppym@gentoo.org> +metadata.xml,
-  +python-imaging-0.ebuild, +python-imaging-1.ebuild:
-  New virtual, bug 401009.
diff --git a/virtual/python-imaging/python-imaging-2.ebuild b/virtual/python-imaging/python-imaging-2.ebuild
deleted file mode 100644
index 9b30f0594c64..000000000000
--- a/virtual/python-imaging/python-imaging-2.ebuild
+++ /dev/null
@@ -1,20 +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 python3_{3,4,5} pypy )
-
-inherit python-r1
-
-DESCRIPTION="Virtual for Python Imaging Library"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="jpeg tk"
-
-RDEPEND="dev-python/pillow[jpeg?,tk?,${PYTHON_USEDEP}]"
diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
similarity index 92%
rename from www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
rename to www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild
index bea6836fa041..aec92c54c20d 100644
--- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3.ebuild
+++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-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$
 
@@ -26,8 +26,8 @@ DEPEND="${DEPEND}
 	=www-apache/libapreq2-2*[perl]
 	>=media-libs/imlib2-1.0.6-r1
 	dev-perl/URI
-	>=dev-perl/ImageInfo-1.04-r2
-	>=dev-perl/ImageSize-2.99-r1
+	>=dev-perl/Image-Info-1.40.0
+	>=dev-perl/Image-Size-2.990.0
 	dev-perl/text-template
 	>=dev-perl/CGI-3.08
 	dev-perl/Image-Imlib2
diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild
index a339c0313810..112a8dc81778 100644
--- a/www-apps/cgit/cgit-9999.ebuild
+++ b/www-apps/cgit/cgit-9999.ebuild
@@ -13,7 +13,7 @@ inherit webapp eutils multilib user toolchain-funcs git-2
 DESCRIPTION="a fast web-interface for git repositories"
 HOMEPAGE="http://git.zx2c4.com/cgit/about"
 SRC_URI=""
-EGIT_REPO_URI="git://git.zx2c4.com/cgit"
+EGIT_REPO_URI="https://git.zx2c4.com/cgit"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/www-apps/metadot/metadot-6.1.6.ebuild b/www-apps/metadot/metadot-6.1.6-r1.ebuild
similarity index 95%
rename from www-apps/metadot/metadot-6.1.6.ebuild
rename to www-apps/metadot/metadot-6.1.6-r1.ebuild
index 9d7c2de08aa5..8dc917a9643c 100644
--- a/www-apps/metadot/metadot-6.1.6.ebuild
+++ b/www-apps/metadot/metadot-6.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,7 +32,7 @@ RDEPEND="
 	dev-perl/Spreadsheet-WriteExcel
 	dev-perl/Date-Calc
 	dev-perl/AppConfig
-	dev-perl/ImageSize
+	dev-perl/Image-Size
 	dev-perl/Template-Toolkit
 	virtual/perl-Time-HiRes
 	dev-perl/Lingua-EN-NameParse
diff --git a/www-apps/metadot/metadot-6.4.5.4.ebuild b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
similarity index 95%
rename from www-apps/metadot/metadot-6.4.5.4.ebuild
rename to www-apps/metadot/metadot-6.4.5.4-r1.ebuild
index 6ca41f9494cf..e2a82c1f8983 100644
--- a/www-apps/metadot/metadot-6.4.5.4.ebuild
+++ b/www-apps/metadot/metadot-6.4.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-perl/Unicode-String-2.07
 	>=dev-perl/Spreadsheet-WriteExcel-0.41
 	>=dev-perl/Date-Calc-5.3
-	>=dev-perl/ImageSize-2.991
+	>=dev-perl/Image-Size-2.991.0
 	>=dev-perl/Template-Toolkit-2.09
 	>=virtual/perl-Time-HiRes-1.48
 	>=virtual/perl-Test-Harness-2.28
diff --git a/www-client/epiphany/epiphany-3.18.4.ebuild b/www-client/epiphany/epiphany-3.18.4.ebuild
index 036093c403f9..d35f280ec046 100644
--- a/www-client/epiphany/epiphany-3.18.4.ebuild
+++ b/www-client/epiphany/epiphany-3.18.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nss test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.5.5
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index a4ce5bcbc626..9a2e212e1f1b 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1 +1,2 @@
 DIST pybugz-0.11.1.tar.gz 23787 SHA256 05b2cef8a655ab34d9279e6341d16a803af07958e72320125cb30a3fd6bc8eec SHA512 bc2277a8e900765bf1799e5de65de5df8184bf50b6ca7c78478a9f43ceb78aa66bcb53c3fd89f7b194b13fa14ad162291d559554a8cb073c071104e2b0978c61 WHIRLPOOL cb8f9a36cac6ae7a42e43d6d9489e2593c8ae76153b769bf04f269967e6477e37b1633d30969c4d7c6d0bcd816aff7bd189a1754c06769e3ea0f761eda3c16db
+DIST pybugz-0.12.1.tar.gz 25606 SHA256 aade267d2ee6b02d6872e019ef4ddf8f96e1d81668faa2506e96875fa2981bc7 SHA512 bb76baf8105f4b56b106c3e63f5aebb322659141edf9c5e5af747db5824abffb7b127703ecb7111f9480d05bdb2f11b3fef2cd5f99078d9dda00e841b4ce7394 WHIRLPOOL 0b345efb5f6ce40e5c5910f576e544b2fc65c73beec3843fae21504455c23f3cd5aac41801a2eb733def50485455345e78e8c94287a1943747f608cc63a27e3d
diff --git a/www-client/pybugz/pybugz-0.12.1.ebuild b/www-client/pybugz/pybugz-0.12.1.ebuild
new file mode 100644
index 000000000000..3445cef687df
--- /dev/null
+++ b/www-client/pybugz/pybugz-0.12.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_3 python3_4 python3_5 )
+PYTHON_REQ_USE="readline(+)"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://github.com/williamh/pybugz.git
+		https://github.com/williamh/pybugz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	inherit vcs-snapshot
+fi
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Command line interface to (Gentoo) Bugzilla"
+HOMEPAGE="https://www.github.com/williamh/pybugz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="zsh-completion"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp contrib/bash-completion bugz
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh-completion _pybugz
+	fi
+}
diff --git a/www-servers/nginx/files/nginx.logrotate-r1 b/www-servers/nginx/files/nginx.logrotate-r1
index a78ed7a1a79c..23665e5f204a 100644
--- a/www-servers/nginx/files/nginx.logrotate-r1
+++ b/www-servers/nginx/files/nginx.logrotate-r1
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,6 +7,6 @@
 	delaycompress
 	sharedscripts
 	postrotate
-		test -r /run/nginx.pid && kill -USR1 `cat /run/nginx.pid`
+		nginx -s reopen
 	endscript
 }
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
index fdec7e69781e..27a8968bf53e 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/goffice/goffice-0.10.27.ebuild b/x11-libs/goffice/goffice-0.10.27.ebuild
index 3b351e27f315..630e90fa6f8e 100644
--- a/x11-libs/goffice/goffice-0.10.27.ebuild
+++ b/x11-libs/goffice/goffice-0.10.27.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # Build fails with -gtk
diff --git a/x11-libs/gtk+/gtk+-2.24.29.ebuild b/x11-libs/gtk+/gtk+-2.24.29.ebuild
index 99bd548e5f7d..495153e00101 100644
--- a/x11-libs/gtk+/gtk+-2.24.29.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.29.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 COMMON_DEPEND="
diff --git a/x11-libs/gtk+/gtk+-3.18.7.ebuild b/x11-libs/gtk+/gtk+-3.18.7.ebuild
index 2e1373f1e0a3..f31d76f93288 100644
--- a/x11-libs/gtk+/gtk+-3.18.7.ebuild
+++ b/x11-libs/gtk+/gtk+-3.18.7.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
diff --git a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
index e4630af2bd46..cd4df794e4e8 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
@@ -18,7 +18,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/x11-libs/libwnck/libwnck-3.14.1.ebuild b/x11-libs/libwnck/libwnck-3.14.1.ebuild
index 07688d69d72a..c7a8e6608ae1 100644
--- a/x11-libs/libwnck/libwnck-3.14.1.ebuild
+++ b/x11-libs/libwnck/libwnck-3.14.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/pango/pango-1.38.1.ebuild b/x11-libs/pango/pango-1.38.1.ebuild
index 8217eb374ab1..392a21fca6a0 100644
--- a/x11-libs/pango/pango-1.38.1.ebuild
+++ b/x11-libs/pango/pango-1.38.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/vte/vte-0.42.4.ebuild b/x11-libs/vte/vte-0.42.4.ebuild
index 909abbd253eb..0fda0df0b591 100644
--- a/x11-libs/vte/vte-0.42.4.ebuild
+++ b/x11-libs/vte/vte-0.42.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.40:2
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
index c96f62462c73..7b5a902ebd69 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X]
 RDEPEND="
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
index f8132d69aed8..2db33448c18d 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-themes/hicolor-icon-theme-0.10
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
index d3c4b3a68a36..fa041739be25 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
index 246bba32bf8e..d4cc9eab9ba4 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gtk"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	gnome-base/librsvg:2[${MULTILIB_USEDEP}]
diff --git a/virtual/python-imaging/Manifest b/x11-themes/mate-themes-meta/Manifest
similarity index 100%
rename from virtual/python-imaging/Manifest
rename to x11-themes/mate-themes-meta/Manifest
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild b/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
new file mode 100644
index 000000000000..1b9eb480bb21
--- /dev/null
+++ b/x11-themes/mate-themes-meta/mate-themes-meta-1.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="|| (
+		(
+			=x11-libs/gtk+-3.16*:3
+			=x11-themes/mate-themes-1.10*:0/3.16
+		)
+		(
+			=x11-libs/gtk+-3.18*:3
+			=x11-themes/mate-themes-1.10*:0/3.18
+		)
+		=x11-themes/mate-themes-1.10*:0
+	)"
diff --git a/virtual/python-imaging/metadata.xml b/x11-themes/mate-themes-meta/metadata.xml
similarity index 72%
rename from virtual/python-imaging/metadata.xml
rename to x11-themes/mate-themes-meta/metadata.xml
index 7f4f33c6dbc9..b189665aa7a1 100644
--- a/virtual/python-imaging/metadata.xml
+++ b/x11-themes/mate-themes-meta/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-themes/mate-themes/mate-themes-1.10.5-r180.ebuild b/x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild
similarity index 98%
rename from x11-themes/mate-themes/mate-themes-1.10.5-r180.ebuild
rename to x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild
index c073a417988a..deb706cb5472 100644
--- a/x11-themes/mate-themes/mate-themes-1.10.5-r180.ebuild
+++ b/x11-themes/mate-themes/mate-themes-1.10.5-r161.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="A set of MATE themes, with sets for users with limited or low visio
 HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0/${MATE_GTK_V}"
 KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${PN}-gtk${MATE_GTK_V}-${PV}"
diff --git a/x11-themes/mate-themes/mate-themes-1.10.5-r160.ebuild b/x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild
similarity index 98%
rename from x11-themes/mate-themes/mate-themes-1.10.5-r160.ebuild
rename to x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild
index c073a417988a..deb706cb5472 100644
--- a/x11-themes/mate-themes/mate-themes-1.10.5-r160.ebuild
+++ b/x11-themes/mate-themes/mate-themes-1.10.5-r181.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="A set of MATE themes, with sets for users with limited or low visio
 HOMEPAGE="http://mate-desktop.org"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0/${MATE_GTK_V}"
 KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/${PN}-gtk${MATE_GTK_V}-${PV}"
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index d8c572a58036..c4256568fe7a 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -5,3 +5,4 @@ DIST enlightenment-0.19.10.tar.xz 24594372 SHA256 8bdc2b764765e807df263962cb3c47
 DIST enlightenment-0.19.12.tar.xz 24569084 SHA256 55f23c337e3092e735ae37ada8f6701adab5ddd13f37ef38c63eec8a536f0b25 SHA512 30332fa0108a4361dd7cc961325b607fccef99caa1db6eaf068fc97de9978ad21dde5724a7e8f6612441fb0529a56461c8df63de25579f67d452fa9bf382d859 WHIRLPOOL e19f84c4a6311ef583d8f2bd53bc85a13e37bc65bdccc1823953685e0946f18cfaf0a75ee97f1a97e5d7fb9c9b0711b92f00f6949e5ca44718b6bf2347cb3a4c
 DIST enlightenment-0.20.1.tar.xz 25038128 SHA256 820b14ab3decd585a011973d97efc0679a90f803b9d72f0726166a3262c1f4ee SHA512 6afffebfe5d223c288f80589b105badcfbd34c9277078fa7704937ae5173d2b866c57c2aee46d7cae9a6c9ac8d59f0b62bb0081e819b69a37d48571cbfc492cb WHIRLPOOL b4428665554086e6d97b42687a683d0facc25ec3013a2c91cbccce4943edb0541667db243268692a5e9f9a86231a1a0104548e887986baa64c480074eb0360fb
 DIST enlightenment-0.20.2.tar.xz 25037464 SHA256 441009a5cbe19861bc1f1404ce4361184ace27208ce429a51c23344c8f9f5d39 SHA512 7d6c5a0a435bbbe999848272ad017d5e914566aa3b833a423bfe21ffeabad17d8a6e91fc597c6ecfd94638c907aa24960a0d017bb4f3f0555875a4ca202415a8 WHIRLPOOL 333b36297ca01b243063e9470eb814b0aafebe25d1a3d58892a7a559455ee08671bb29878eb920df34e06b0fccafeafdbb45bde03fc587a0eea9f054046c5102
+DIST enlightenment-0.20.5.tar.xz 25039672 SHA256 22749584d2fdf62d5a63c64dd9e57a1e318837a48f10fb9cdd2097769aa802d0 SHA512 0d66d23b3462d6bf293229256d88d486d05135ff7bc7ab4258c3923c853f1935a1850b3a3ff0dabb1aae99a31dafb578f5cbb5678d08df490d3c6837b874a911 WHIRLPOOL 5bfa8e6cc2d5d17fc61a08fc9edbc8970f60cb9e44fcfaf7035b764d21525b375ce9f4060ac33a45627cc3a1f2eb21335e322f88f8a79709fce9284aa668d983
diff --git a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
index 3b6c43a8c67c..05e09ca4fd90 100644
--- a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.17.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$
 
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_URI_APPEND="${PN}"
 else
 	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
-	EKEY_STATE="live"
+	EKEY_STATE="snap"
 fi
 
 inherit enlightenment
@@ -54,8 +54,8 @@ RDEPEND="
 		>=x11-libs/pixman-0.31.1
 		>=x11-libs/libxkbcommon-0.3.1
 	)
-	>=dev-libs/efl-1.16[X]
-	>=media-libs/elementary-1.16
+	>=dev-libs/efl-1.17[X]
+	>=media-libs/elementary-1.17
 	x11-libs/xcb-util-keysyms"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-wm/enlightenment/enlightenment-0.20.5.ebuild b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
new file mode 100644
index 000000000000..05e09ca4fd90
--- /dev/null
+++ b/x11-wm/enlightenment/enlightenment-0.20.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment DR17 window manager"
+
+LICENSE="BSD-2"
+SLOT="0.17/${PV%%_*}"
+
+__CONF_MODS=(
+	applications bindings dialogs display
+	interaction intl menus
+	paths performance randr shelves theme
+	window-manipulation window-remembers
+)
+__NORM_MODS=(
+	appmenu backlight bluez4 battery
+	clock conf connman cpufreq everything
+	fileman fileman-opinfo gadman geolocation
+	ibar ibox lokker
+	mixer msgbus music-control notification
+	pager packagekit pager-plain policy-mobile quickaccess
+	shot start syscon systray tasks teamwork temperature tiling
+	winlist wizard wl-desktop-shell wl-drm wl-text-input
+	wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland
+)
+IUSE_E_MODULES=(
+	${__CONF_MODS[@]/#/enlightenment_modules_conf-}
+	${__NORM_MODS[@]/#/enlightenment_modules_}
+)
+
+IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES[@]/#/+}"
+
+RDEPEND="
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		dev-libs/efl[wayland]
+		>=dev-libs/wayland-1.2.0
+		>=x11-libs/pixman-0.31.1
+		>=x11-libs/libxkbcommon-0.3.1
+	)
+	>=dev-libs/efl-1.17[X]
+	>=media-libs/elementary-1.17
+	x11-libs/xcb-util-keysyms"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/quickstart.diff
+	enlightenment_src_prepare
+}
+
+# Sanity check to make sure module lists are kept up-to-date.
+check_modules() {
+	local detected=$(
+		awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \
+		configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort
+	)
+	local sorted=$(
+		printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \
+		LC_COLLATE=C sort
+	)
+	if [[ ${detected} != "${sorted}" ]] ; then
+		local out new old
+		eerror "The ebuild needs to be kept in sync."
+		echo "${sorted}" > ebuild-iuse
+		echo "${detected}" > configure-detected
+		out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d')
+		new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}')
+		old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}')
+		eerror "Add these modules: $(echo ${new})"
+		eerror "Drop these modules: $(echo ${old})"
+		die "please update the ebuild"
+	fi
+}
+
+src_configure() {
+	check_modules
+
+	E_ECONF=(
+		--disable-install-sysactions
+		$(use_enable doc)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable systemd)
+		--enable-device-udev
+		$(use_enable udev mount-eeze)
+		$(use_enable ukit mount-udisks)
+		$(use_enable wayland)
+	)
+	local u c
+	for u in ${IUSE_E_MODULES[@]} ; do
+		c=${u#enlightenment_modules_}
+		# Disable modules by hand since we default to enabling them all.
+		case ${c} in
+		wl-*|xwayland)
+			if ! use wayland ; then
+				E_ECONF+=( --disable-${c} )
+				continue
+			fi
+			;;
+		esac
+		E_ECONF+=( $(use_enable ${u} ${c}) )
+	done
+	enlightenment_src_configure
+}
+
+src_install() {
+	enlightenment_src_install
+	insinto /etc/enlightenment
+	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
+}
diff --git a/x11-wm/muffin/muffin-2.8.4.ebuild b/x11-wm/muffin/muffin-2.8.4.ebuild
index 01f70916ca1a..905c927d8d85 100644
--- a/x11-wm/muffin/muffin-2.8.4.ebuild
+++ b/x11-wm/muffin/muffin-2.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=x11-libs/pango-1.2[X,introspection?]
diff --git a/x11-wm/mutter/mutter-3.18.2-r1.ebuild b/x11-wm/mutter/mutter-3.18.2-r1.ebuild
index c279529275eb..ac1d7156a505 100644
--- a/x11-wm/mutter/mutter-3.18.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.18.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/mutter/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index c63a5002f7f3..7f898910cd13 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,6 +1,4 @@
 DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8e6d909d2514a3ca653502efb SHA512 5f195b211b8e78091ba42661c08f367d66e2a34ebcea9e5df57f0408cf1c4232294d38692171abbfe7396a1da28b2cc4100252dc034872a278530c48282db5cf WHIRLPOOL b14d58cddd03093a598e99d69fb145a5a04347f48fc0ec0b0311efa7bc75f5a51be5db93a361032ead2e021d2c8ead13986a3bd7434108506bbc4b601556141b
+DIST xpra-0.14.34.tar.xz 1127536 SHA256 1f59e3d308bdff6e3b19df0c671a97d2a4bc8e1ec1c3dd49c2bbc8f9feefd8aa SHA512 e19cc701fce797ca96bbf1cc1e4140b8a1d35ca5c1a8bd3cf4a16623908c28c0dd119f654e103352a3a2ec09735bf8562f4669aefe39b746933202621e905230 WHIRLPOOL 32a175b04ab8b6bdf3e5a53bea91a6e01925a3f40358e3edf2a786d58d52e05d917a04f3ffdcf8bbee07fb5ce8c8d032e5cbc52542d9b16a13ba072ff4aa71af
 DIST xpra-0.15.10.tar.xz 1200040 SHA256 1403aaf571c486bb4a67bc9e9d431e5f863c9b7912bd65e6aec62fcea2d9d4e0 SHA512 add1e63da75b7e29163a7e0957e3f841019c557ba42b15f437ed385de99905cb28a3760386570b72c5d2ba305c5b7779a85ca39d4452ccd6133c26f0a7983d9a WHIRLPOOL a5c50b68b39786aad6c50332340bf421ac17f38948880acb49d55769e8a9b4fb48b068a0fea0e5e660e9621b460eb60d19131600173b826b54a4f7d2e623fb5f
-DIST xpra-0.15.6.tar.xz 1196700 SHA256 cebd8d22d4173610258c835f175ad3781cf49bf91b3d6d3c36c35a825228fa32 SHA512 750b24d06b6af93757e54651c0e5e55192280715c4439e56881824da90dcea25460631c993bf239c6f9023e74dce5063e32688e31c616d036da16fa3da8c304a WHIRLPOOL 66cdc20662ba4251506e03a969332996870e37fe6f60becd3f2feed7b24e1410bc793f5f4679a0dc58940bda52d26563f9db10f8ae3fd83fb60cb89988be38a0
-DIST xpra-0.15.7.tar.xz 1197012 SHA256 b07ed8708023583788de6b5fec579505c2d13fbe96243e9bd0fd696b66ead8e2 SHA512 a75c3299b1f3074556440cc2822557564cf48e6a9c2ea061073ccca0ea204578713ece1e43389d0b808bd02cba9646bd161399661b1d52161e497e4406d029fa WHIRLPOOL e187d25bb6f947b36934f02682ce0d4e091df874f9e3ef25fd261435fd79d3ad5167417ae8e75f167470ac57285d07aa11b6d7d8b51573321569a3a86e2db150
-DIST xpra-0.15.8.tar.xz 1198496 SHA256 e6ca124c89cfa81c8ee69dd2d746cdb0b4d896af6b369e60abc50d2fd2d2a0d2 SHA512 0c23bda2ad2ac2355da1e867f3909e13c2146a5f1b0c4903628e1177edb143fb10a57e8cfaada901bf1df0ec71f87356444856405f0f32f99abc1b655d2de636 WHIRLPOOL abc1e6691f459eea0454df870c0c96bf06b628816e2c283090eac467b6c1fbaf0df6e4f7b229c9eb719acdb8630cb441119ce95b6be2b95ac7385c8a0f5bd2e8
-DIST xpra-0.15.9.tar.xz 1199224 SHA256 bdf51ae3d4114050ff23f7a88fc10af0eb55dd6f74412a6b2c10efeaf6499116 SHA512 83b3452b45a3fa3ea095cef5d2ed901d754903b9aed20cb5a42e0172e9f7058abd88f8635b36adbf314114a4c396a6478e64611273ac61c369332d8590bcef76 WHIRLPOOL 900f5325ebe4ae78b3da214a153961a2c1925ce52f7645ecfcd5254a38f6f942accb263cccfa41eb3b305bef28692ade610e78e17d0c87c1c15b8354656e192b
+DIST xpra-0.16.2.tar.xz 1341856 SHA256 ce99b941f63aeae465c9d095bcdef857227f8102759df3d013fbfb65c8cea540 SHA512 a5431367918551c630a7f80bd59c51b3bd360472ee268b7865862f4de03b0962b534ab65c4926faa386098c48cdab49f8d7e91b60b998017df52ab077d270a33 WHIRLPOOL bb3c89eb6f32349f26b076abea5535b9e37a3ea2789be9aa35723a383603cce090044d8b8631817b5eda0b158ddcf2c278240e977a3daed0c8fe510e576f4135
diff --git a/x11-wm/xpra/files/xpra-0.16.2-prefix.patch b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch
new file mode 100644
index 000000000000..4559578d63ce
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch
@@ -0,0 +1,27 @@
+--- xpra-0.16.2/setup.py
++++ xpra-0.16.2/setup.py
+@@ -1723,8 +1723,8 @@
+         #prepare default [/usr/local]/etc configuration files:
+         if '--user' in sys.argv:
+             etc_prefix = 'etc/xpra'
+-        elif sys.prefix == '/usr':
+-            etc_prefix = '/etc/xpra'
++        elif sys.prefix[-4:] == '/usr':
++            etc_prefix = sys.prefix[:-4] + '/etc/xpra'
+         else:
+             etc_prefix = sys.prefix + '/etc/xpra'
+ 
+--- xpra-0.16.2/xpra/platform/paths.py
++++ xpra-0.16.2/xpra/platform/paths.py
+@@ -40,9 +40,9 @@
+ def do_get_system_conf_dirs():
+     prefix = get_install_prefix()
+     #the system wide configuration directory
+-    if prefix == '/usr':
++    if prefix[-4:] == '/usr':
+         #default posix config location:
+-        return ['/etc/xpra']
++        return [sys.prefix[:-4] + '/etc/xpra']
+     #hope the prefix is something like "/usr/local" or "$HOME/.local":
+     return [prefix + '/etc/xpra/']
+ 
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index bc86193d0e88..60f9071b5617 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -10,14 +10,15 @@
 </upstream>
 <use>
 	<flag name="client">Build client-side code</flag>
-	<flag name="server">Build server-side code</flag>
 	<flag name="clipboard">Enable clipboard support</flag>
-	<flag name="rencode">Enable rencode support</flag>
-	<flag name="vpx">Enable vpx image format support</flag>
-	<flag name="webp">Enable webp image format support</flag>
 	<flag name="csc">Enable csc softscaler support</flag>
 	<flag name="dec_av">Enable dec_avcodec support</flag>
 	<flag name="dec_av2">Enable dec_avcodec2 support</flag>
+	<flag name="lz4">Enable support for lz4 compression</flag>
+	<flag name="rencode">Enable rencode support</flag>
+	<flag name="server">Build server-side code</flag>
+	<flag name="vpx">Enable vpx image format support</flag>
+	<flag name="webp">Enable webp image format support</flag>
 	<flag name="x265">Enable x265 support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/xpra-0.15.7.ebuild b/x11-wm/xpra/xpra-0.14.34.ebuild
similarity index 83%
rename from x11-wm/xpra/xpra-0.15.7.ebuild
rename to x11-wm/xpra/xpra-0.14.34.ebuild
index c5ca308f940b..d917a674f275 100644
--- a/x11-wm/xpra/xpra-0.15.7.ebuild
+++ b/x11-wm/xpra/xpra-0.14.34.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
+IUSE="+client +clipboard csc dec_av dec_av2 libav lz4 lzo opengl pulseaudio +rencode server sound vpx webp x264 x265"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
@@ -36,6 +36,10 @@ COMMON_DEPEND=""${PYTHON_DEPS}"
 		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
 		libav? ( media-video/libav:0= )
 	)
+	dec_av? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
 	dec_av2? (
 		!libav? ( >=media-video/ffmpeg-2:0= )
 		libav? ( media-video/libav:0= )
@@ -60,11 +64,15 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
 	server? ( x11-base/xorg-server[-minimal,xvfb]
 		x11-drivers/xf86-input-void
 		x11-drivers/xf86-video-dummy
@@ -74,11 +82,9 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
-	rm -rf rencode || die
-
 	epatch \
 		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
+		"${FILESDIR}"/${PN}-0.14.0-prefix.patch
 
 	if use libav ; then
 		if ! has_version ">=media-video/libav-9" ; then
@@ -94,9 +100,11 @@ python_configure_all() {
 		$(use_with client)
 		$(use_with clipboard)
 		$(use_with csc csc_swscale)
-		$(use_with cups printing)
+		$(use_with dec_av dec_avcodec)
 		$(use_with dec_av2 dec_avcodec2)
 		$(use_with opengl)
+		$(use_with rencode)
+		$(use_with server cymaths)
 		$(use_with server shadow)
 		$(use_with server)
 		$(use_with sound)
@@ -105,8 +113,11 @@ python_configure_all() {
 		$(use_with x264 enc_x264)
 		$(use_with x265 enc_x265)
 		--with-Xdummy
+		--with-argb
+		--with-cyxor
 		--with-gtk2
 		--without-gtk3
+		--without-qt4
 		--with-strict
 		--with-warn
 		--with-x11
diff --git a/x11-wm/xpra/xpra-0.15.8.ebuild b/x11-wm/xpra/xpra-0.15.10-r1.ebuild
similarity index 89%
rename from x11-wm/xpra/xpra-0.15.8.ebuild
rename to x11-wm/xpra/xpra-0.15.10-r1.ebuild
index c5ca308f940b..6a19d6ef45a4 100644
--- a/x11-wm/xpra/xpra-0.15.8.ebuild
+++ b/x11-wm/xpra/xpra-0.15.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
+IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
@@ -60,11 +60,17 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
 	server? ( x11-base/xorg-server[-minimal,xvfb]
 		x11-drivers/xf86-input-void
 		x11-drivers/xf86-video-dummy
diff --git a/x11-wm/xpra/xpra-0.15.6.ebuild b/x11-wm/xpra/xpra-0.15.6.ebuild
deleted file mode 100644
index 60c3a614a9f7..000000000000
--- a/x11-wm/xpra/xpra-0.15.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	rm -rf rencode || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
-
-	if use libav ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-gtk2
-		--without-gtk3
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.15.9.ebuild b/x11-wm/xpra/xpra-0.15.9.ebuild
deleted file mode 100644
index c5ca308f940b..000000000000
--- a/x11-wm/xpra/xpra-0.15.9.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	clipboard? ( || ( server client ) )
-	opengl? ( client )
-	|| ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_av2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	opengl? ( dev-python/pygtkglext )
-	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
-	webp? ( media-libs/libwebp )
-	x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
-	)
-	x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/ssh
-	x11-apps/setxkbmap
-	x11-apps/xmodmap
-	server? ( x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-		x11-drivers/xf86-video-dummy
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	rm -rf rencode || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
-
-	if use libav ; then
-		if ! has_version ">=media-video/libav-9" ; then
-			epatch patches/old-libav.patch
-		fi
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(use_with cups printing)
-		$(use_with dec_av2 dec_avcodec2)
-		$(use_with opengl)
-		$(use_with server shadow)
-		$(use_with server)
-		$(use_with sound)
-		$(use_with vpx)
-		$(use_with webp)
-		$(use_with x264 enc_x264)
-		$(use_with x265 enc_x265)
-		--with-Xdummy
-		--with-gtk2
-		--without-gtk3
-		--with-strict
-		--with-warn
-		--with-x11
-		--without-PIC
-		--without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.15.10.ebuild b/x11-wm/xpra/xpra-0.16.2.ebuild
similarity index 79%
rename from x11-wm/xpra/xpra-0.15.10.ebuild
rename to x11-wm/xpra/xpra-0.16.2.ebuild
index c5ca308f940b..3838b86e8826 100644
--- a/x11-wm/xpra/xpra-0.15.10.ebuild
+++ b/x11-wm/xpra/xpra-0.16.2.ebuild
@@ -3,9 +3,9 @@
 # $Id$
 EAPI=5
 
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
 PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils flag-o-matic
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav opengl pulseaudio server sound vpx webp x264 x265"
+IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
@@ -42,9 +42,9 @@ COMMON_DEPEND=""${PYTHON_DEPS}"
 	)
 	opengl? ( dev-python/pygtkglext )
 	pulseaudio? ( media-sound/pulseaudio )
-	sound? ( media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10
-		dev-python/gst-python:0.10 )
+	sound? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		dev-python/gst-python:1.0 )
 	vpx? ( media-libs/libvpx virtual/ffmpeg )
 	webp? ( media-libs/libwebp )
 	x264? ( media-libs/x264
@@ -60,11 +60,16 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
 	virtual/ssh
-	x11-apps/setxkbmap
 	x11-apps/xmodmap
+	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+	opengl? (
+		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+	)
 	server? ( x11-base/xorg-server[-minimal,xvfb]
 		x11-drivers/xf86-input-void
 		x11-drivers/xf86-video-dummy
@@ -78,7 +83,7 @@ python_prepare_all() {
 
 	epatch \
 		"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-		"${FILESDIR}"/${PN}-0.15.0-prefix.patch
+		"${FILESDIR}"/${PN}-0.16.2-prefix.patch
 
 	if use libav ; then
 		if ! has_version ">=media-video/libav-9" ; then
@@ -112,4 +117,8 @@ python_configure_all() {
 		--with-x11
 		--without-PIC
 		--without-debug )
+
+	# see https://www.xpra.org/trac/ticket/1080 
+	# and http://trac.cython.org/ticket/395
+	append-cflags -fno-strict-aliasing
 }
diff --git a/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild b/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild
index 1aff29ff14b5..82a508b4641d 100644
--- a/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild
+++ b/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-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$
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-RDEPEND="app-shells/bash
+RDEPEND="app-shells/bash:*
 	>=x11-misc/gtkdialog-0.8"
 DEPEND="${RDEPEND}"